Bumped v5.6.18

* Support for non-friendly chars in url username and password
- Added auth option to Connection class
- Updated pool.addConnection

* Updated test

.ci/test-matrix.yml

@@ -1,11 +1,10 @@
 ---
 ELASTICSEARCH_VERSION:
-- 5.6.16
+  - 5.6.16
 
 NODE_JS_VERSION:
-- 11
-- 10
-- 8
-- 6
+  - 12
+  - 10
+  - 8
 
 exclude: ~

.npmignore

@@ -67,3 +67,6 @@ scripts
 .ci
 .travis.yml
 certs
+.github
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md

.travis.yml

@@ -5,25 +5,15 @@ sudo: required
 language: node_js
 
 node_js:
+  - "12"
   - "10"
   - "8"
-  - "6"
-
-env:
-  global:
-    - ELASTICSEARCH_VERSION=5.6.16
-    - QUIET=true
-
-before_install:
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz
-  - tar -xzf elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz
-  - ./elasticsearch-${ELASTICSEARCH_VERSION}/bin/elasticsearch -Enode.attr.testattr=test -Epath.repo=/tmp -Erepositories.url.allowed_urls='http://snapshot.*' &> /dev/null &
 
 install:
   - npm install
 
 script:
-  - npm run ci
+  - npm run license-checker && npm run test
 
 notifications:
   email:

README.md

@@ -6,8 +6,7 @@
 
 ---
 
-**Note:** In the past months we have worked on the new Elasticsearch Node.js client, we will announce it soon!
-If you want you can already try it by following the instructions below, while if you're going to use the legacy one or report an issue, please check out [elastic/elasticsearch-js-legacy](https://github.com/elastic/elasticsearch-js-legacy).
+**Note:** In the past months we have worked on the new Elasticsearch Node.js client, and if you want you can already try it by following the instructions below, while if you're going to use the legacy one or report an issue, please check out [elastic/elasticsearch-js-legacy](https://github.com/elastic/elasticsearch-js-legacy).
 
 ---
 
@@ -28,11 +27,7 @@ npm install @elastic/elasticsearch
 
 ### Compatibility
 
----
-
-**Warning:** currently on npm you will only find a beta release that works with Elasticsearch 7, we will add the support for Elasticsearch 5, 6, and 7 once we release the final version of this library.
-
----
+The minimum supported version of Node.js is `v8`.
 
 The library is compatible with all Elasticsearch versions since 5.x, but you should use the same major version of the Elasticsearch instance that you are using.
 ```
@@ -46,8 +41,46 @@ The library is compatible with all Elasticsearch versions since 5.x, but you sho
 @elastic/elasticsearch@5
 ```
 
+#### Install multiple versions
+If you are using multiple versions of Elasticsearch, you need to use multiple versions of the client. In the past, install multiple versions of the same package was not possible, but with `npm v6.9`, you can do that via aliasing.
+
+The command you must run to install different version of the client is:
+```sh
+npm install <alias>@npm:@elastic/elasticsearch@<version>
+```
+So for example if you need to install `7.x` and `6.x`, you will run
+```sh
+npm install es6@npm:@elastic/elasticsearch@6
+npm install es7@npm:@elastic/elasticsearch@7
+```
+And your `package.json` will look like the following:
+```json
+"dependencies": {
+  "es6": "npm:@elastic/elasticsearch@^6.7.0",
+  "es7": "npm:@elastic/elasticsearch@^7.0.0"
+}
+```
+And finally, you will require the packages from your code by using the alias you have defined.
+```js
+const { Client: Client6 } = require('es6')
+const { Client: Client7 } = require('es7')
+
+const client6 = new Client6({ node: 'http://localhost:9200' })
+const client7 = new Client7({ node: 'http://localhost:9201' })
+
+client6.info(console.log)
+client7.info(console.log)
+```
+
+Finally, if you want to install the client for the next version of Elasticsearch *(the one that lives in Elasticsearch’s master branch)*, you can use the following command:
+```sh
+npm install esmaster@github:elastic/elasticsearch-js
+```
+
 ## Usage
-You can find the full documentation in the [docs](https://github.com/elastic/elasticsearch-js/tree/master/docs) folder.
+
+You can find the full documentation in our [docs](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html) website.
+
 ```js
 const { Client } = require('@elastic/elasticsearch')
 const client = new Client({ node: 'http://localhost:9200' })
@@ -77,7 +110,9 @@ The returned value of **every** API call is formed as follows:
 }
 ```
 ### Client options
+
 The client is designed to be easily configured as you see fit for your needs, following you can see all the possible options that you can use to configure it.
+
 ```ts
 {
   // the Elasticsearch endpoint to use
@@ -120,6 +155,10 @@ The client is designed to be easily configured as you see fit for your needs, fo
   nodeFilter: nodeFilterFn;
   // custom selection strategy, defaults `round-robin`
   nodeSelector: nodeSelectorFn | string;
+  // function to generate the request id for every request
+  generateRequestId: generateRequestIdFn;
+  // name to identify the client instance in the events
+  name: string;
 }
 ```
 
@@ -144,7 +183,9 @@ The supported *request specific options* are:
   asStream: boolean, // default `false`
   compression: string, // default `false`
   headers: object, // default `null`
-  querystring: object // default `null`
+  querystring: object // default `null`,
+  context: object // default `null`,
+  id: any // default incr. integer
 }
 ```
 

api/api/bulk.js

@@ -24,7 +24,7 @@
 
 function buildBulk (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [bulk](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-bulk.html) request
    *
@@ -99,17 +99,17 @@ function buildBulk (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -130,34 +130,8 @@ function buildBulk (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.aliases.js

@@ -24,7 +24,7 @@
 
 function buildCatAliases (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.aliases](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-alias.html) request
    *
@@ -83,17 +83,17 @@ function buildCatAliases (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    var warnings = []
+    var { method, body, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatAliases (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.allocation.js

@@ -24,7 +24,7 @@
 
 function buildCatAllocation (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.allocation](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-allocation.html) request
    *
@@ -85,17 +85,17 @@ function buildCatAllocation (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, nodeId, node_id } = params
-    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
+    var warnings = []
+    var { method, body, nodeId, node_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildCatAllocation (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.count.js

@@ -24,7 +24,7 @@
 
 function buildCatCount (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.count](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-count.html) request
    *
@@ -83,17 +83,17 @@ function buildCatCount (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatCount (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.fielddata.js

@@ -24,7 +24,7 @@
 
 function buildCatFielddata (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.fielddata](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-fielddata.html) request
    *
@@ -87,17 +87,17 @@ function buildCatFielddata (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, fields } = params
-    var querystring = semicopy(params, ['method', 'body', 'fields'])
+    var warnings = []
+    var { method, body, fields, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildCatFielddata (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.health.js

@@ -24,7 +24,7 @@
 
 function buildCatHealth (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.health](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-health.html) request
    *
@@ -84,17 +84,17 @@ function buildCatHealth (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -109,34 +109,8 @@ function buildCatHealth (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.help.js

@@ -24,7 +24,7 @@
 
 function buildCatHelp (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.help](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat.html) request
    *
@@ -71,17 +71,17 @@ function buildCatHelp (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -96,34 +96,8 @@ function buildCatHelp (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.indices.js

@@ -24,7 +24,7 @@
 
 function buildCatIndices (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.indices](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-indices.html) request
    *
@@ -89,17 +89,17 @@ function buildCatIndices (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -118,34 +118,8 @@ function buildCatIndices (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.master.js

@@ -24,7 +24,7 @@
 
 function buildCatMaster (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.master](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-master.html) request
    *
@@ -82,17 +82,17 @@ function buildCatMaster (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatMaster (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.nodeattrs.js

@@ -24,7 +24,7 @@
 
 function buildCatNodeattrs (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.nodeattrs](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-nodeattrs.html) request
    *
@@ -82,17 +82,17 @@ function buildCatNodeattrs (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatNodeattrs (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.nodes.js

@@ -24,7 +24,7 @@
 
 function buildCatNodes (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.nodes](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-nodes.html) request
    *
@@ -85,17 +85,17 @@ function buildCatNodes (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -110,34 +110,8 @@ function buildCatNodes (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.pending_tasks.js

@@ -24,7 +24,7 @@
 
 function buildCatPendingTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.pending_tasks](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-pending-tasks.html) request
    *
@@ -82,17 +82,17 @@ function buildCatPendingTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatPendingTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.plugins.js

@@ -24,7 +24,7 @@
 
 function buildCatPlugins (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.plugins](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-plugins.html) request
    *
@@ -82,17 +82,17 @@ function buildCatPlugins (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatPlugins (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.recovery.js

@@ -24,7 +24,7 @@
 
 function buildCatRecovery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.recovery](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-recovery.html) request
    *
@@ -83,17 +83,17 @@ function buildCatRecovery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatRecovery (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.repositories.js

@@ -24,7 +24,7 @@
 
 function buildCatRepositories (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.repositories](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-repositories.html) request
    *
@@ -82,17 +82,17 @@ function buildCatRepositories (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -107,34 +107,8 @@ function buildCatRepositories (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.segments.js

@@ -24,7 +24,7 @@
 
 function buildCatSegments (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.segments](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-segments.html) request
    *
@@ -80,17 +80,17 @@ function buildCatSegments (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -109,34 +109,8 @@ function buildCatSegments (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.shards.js

@@ -24,7 +24,7 @@
 
 function buildCatShards (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.shards](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-shards.html) request
    *
@@ -85,17 +85,17 @@ function buildCatShards (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildCatShards (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.snapshots.js

@@ -24,7 +24,7 @@
 
 function buildCatSnapshots (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.snapshots](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-snapshots.html) request
    *
@@ -88,17 +88,17 @@ function buildCatSnapshots (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, repository } = params
-    var querystring = semicopy(params, ['method', 'body', 'repository'])
+    var warnings = []
+    var { method, body, repository, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -117,34 +117,8 @@ function buildCatSnapshots (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.tasks.js

@@ -24,7 +24,7 @@
 
 function buildCatTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.tasks](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/tasks.html) request
    *
@@ -90,17 +90,17 @@ function buildCatTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -115,34 +115,8 @@ function buildCatTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.templates.js

@@ -24,7 +24,7 @@
 
 function buildCatTemplates (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.templates](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-templates.html) request
    *
@@ -83,17 +83,17 @@ function buildCatTemplates (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    var warnings = []
+    var { method, body, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildCatTemplates (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cat.thread_pool.js

@@ -24,7 +24,7 @@
 
 function buildCatThreadPool (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cat.thread_pool](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cat-thread-pool.html) request
    *
@@ -85,17 +85,17 @@ function buildCatThreadPool (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, threadPoolPatterns, thread_pool_patterns } = params
-    var querystring = semicopy(params, ['method', 'body', 'threadPoolPatterns', 'thread_pool_patterns'])
+    var warnings = []
+    var { method, body, threadPoolPatterns, thread_pool_patterns, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildCatThreadPool (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/clear_scroll.js

@@ -24,7 +24,7 @@
 
 function buildClearScroll (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [clear_scroll](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-request-scroll.html) request
    *
@@ -63,17 +63,17 @@ function buildClearScroll (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, scrollId, scroll_id } = params
-    var querystring = semicopy(params, ['method', 'body', 'scrollId', 'scroll_id'])
+    var warnings = []
+    var { method, body, scrollId, scroll_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -92,34 +92,8 @@ function buildClearScroll (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.allocation_explain.js

@@ -24,7 +24,7 @@
 
 function buildClusterAllocationExplain (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.allocation_explain](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-allocation-explain.html) request
    *
@@ -68,17 +68,17 @@ function buildClusterAllocationExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -93,34 +93,8 @@ function buildClusterAllocationExplain (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.get_settings.js

@@ -24,7 +24,7 @@
 
 function buildClusterGetSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.get_settings](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-update-settings.html) request
    *
@@ -78,17 +78,17 @@ function buildClusterGetSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -103,34 +103,8 @@ function buildClusterGetSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.health.js

@@ -24,7 +24,7 @@
 
 function buildClusterHealth (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.health](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-health.html) request
    *
@@ -92,17 +92,17 @@ function buildClusterHealth (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -121,34 +121,8 @@ function buildClusterHealth (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.pending_tasks.js

@@ -24,7 +24,7 @@
 
 function buildClusterPendingTasks (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.pending_tasks](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-pending.html) request
    *
@@ -72,17 +72,17 @@ function buildClusterPendingTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -97,34 +97,8 @@ function buildClusterPendingTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.put_settings.js

@@ -24,7 +24,7 @@
 
 function buildClusterPutSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.put_settings](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-update-settings.html) request
    *
@@ -70,17 +70,17 @@ function buildClusterPutSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -95,34 +95,8 @@ function buildClusterPutSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.remote_info.js

@@ -24,7 +24,7 @@
 
 function buildClusterRemoteInfo (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.remote_info](http://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-remote-info.html) request
    *
@@ -67,17 +67,17 @@ function buildClusterRemoteInfo (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -92,34 +92,8 @@ function buildClusterRemoteInfo (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.reroute.js

@@ -24,7 +24,7 @@
 
 function buildClusterReroute (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.reroute](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-reroute.html) request
    *
@@ -77,17 +77,17 @@ function buildClusterReroute (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildClusterReroute (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.state.js

@@ -24,7 +24,7 @@
 
 function buildClusterState (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.state](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-state.html) request
    *
@@ -92,17 +92,17 @@ function buildClusterState (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, metric } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'metric'])
+    var warnings = []
+    var { method, body, index, metric, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -123,34 +123,8 @@ function buildClusterState (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/cluster.stats.js

@@ -24,7 +24,7 @@
 
 function buildClusterStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [cluster.stats](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-stats.html) request
    *
@@ -73,17 +73,17 @@ function buildClusterStats (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, nodeId, node_id } = params
-    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
+    var warnings = []
+    var { method, body, nodeId, node_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildClusterStats (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/count.js

@@ -24,7 +24,7 @@
 
 function buildCount (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [count](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-count.html) request
    *
@@ -103,17 +103,17 @@ function buildCount (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -134,34 +134,8 @@ function buildCount (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/count_percolate.js

@@ -24,7 +24,7 @@
 
 function buildCountPercolate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [count_percolate](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-percolate.html) request
    *
@@ -108,17 +108,17 @@ function buildCountPercolate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type, id } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type', 'id'])
+    var warnings = []
+    var { method, body, index, type, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -137,34 +137,8 @@ function buildCountPercolate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/create.js

@@ -24,7 +24,7 @@
 
 function buildCreate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [create](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-index_.html) request
    *
@@ -105,17 +105,17 @@ function buildCreate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -130,34 +130,8 @@ function buildCreate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/delete.js

@@ -24,7 +24,7 @@
 
 function buildDelete (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [delete](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-delete.html) request
    *
@@ -107,17 +107,17 @@ function buildDelete (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -132,34 +132,8 @@ function buildDelete (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/delete_by_query.js

@@ -24,7 +24,7 @@
 
 function buildDeleteByQuery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [delete_by_query](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-delete-by-query.html) request
    *
@@ -159,17 +159,17 @@ function buildDeleteByQuery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -188,34 +188,8 @@ function buildDeleteByQuery (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/delete_script.js

@@ -24,7 +24,7 @@
 
 function buildDeleteScript (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [delete_script](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/modules-scripting.html) request
    *
@@ -88,17 +88,17 @@ function buildDeleteScript (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, lang } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'lang'])
+    var warnings = []
+    var { method, body, id, lang, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -117,34 +117,8 @@ function buildDeleteScript (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/delete_template.js

@@ -24,7 +24,7 @@
 
 function buildDeleteTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [delete_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-template.html) request
    *
@@ -72,17 +72,17 @@ function buildDeleteTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    var warnings = []
+    var { method, body, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -97,34 +97,8 @@ function buildDeleteTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/exists.js

@@ -24,7 +24,7 @@
 
 function buildExists (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [exists](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-get.html) request
    *
@@ -108,17 +108,17 @@ function buildExists (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -133,34 +133,8 @@ function buildExists (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/exists_source.js

@@ -24,7 +24,7 @@
 
 function buildExistsSource (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [exists_source](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
    *
@@ -114,17 +114,17 @@ function buildExistsSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -139,34 +139,8 @@ function buildExistsSource (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/explain.js

@@ -24,7 +24,7 @@
 
 function buildExplain (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [explain](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-explain.html) request
    *
@@ -110,17 +110,17 @@ function buildExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -135,34 +135,8 @@ function buildExplain (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/field_caps.js

@@ -24,7 +24,7 @@
 
 function buildFieldCaps (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [field_caps](http://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-field-caps.html) request
    *
@@ -74,17 +74,17 @@ function buildFieldCaps (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -103,34 +103,8 @@ function buildFieldCaps (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/field_stats.js

@@ -24,7 +24,7 @@
 
 function buildFieldStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [field_stats](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-field-stats.html) request
    *
@@ -76,17 +76,17 @@ function buildFieldStats (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -105,34 +105,8 @@ function buildFieldStats (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/get.js

@@ -24,7 +24,7 @@
 
 function buildGet (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [get](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-get.html) request
    *
@@ -108,17 +108,17 @@ function buildGet (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -133,34 +133,8 @@ function buildGet (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/get_script.js

@@ -24,7 +24,7 @@
 
 function buildGetScript (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [get_script](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/modules-scripting.html) request
    *
@@ -83,17 +83,17 @@ function buildGetScript (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, lang } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'lang'])
+    var warnings = []
+    var { method, body, id, lang, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildGetScript (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/get_source.js

@@ -24,7 +24,7 @@
 
 function buildGetSource (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [get_source](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-get.html) request
    *
@@ -105,17 +105,17 @@ function buildGetSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -130,34 +130,8 @@ function buildGetSource (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/get_template.js

@@ -24,7 +24,7 @@
 
 function buildGetTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [get_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-template.html) request
    *
@@ -72,17 +72,17 @@ function buildGetTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    var warnings = []
+    var { method, body, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -97,34 +97,8 @@ function buildGetTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/index.js

@@ -24,7 +24,7 @@
 
 function buildIndex (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [index](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-index_.html) request
    *
@@ -113,17 +113,17 @@ function buildIndex (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    var warnings = []
+    var { method, body, id, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -142,34 +142,8 @@ function buildIndex (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.analyze.js

@@ -24,7 +24,7 @@
 
 function buildIndicesAnalyze (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.analyze](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-analyze.html) request
    *
@@ -87,17 +87,17 @@ function buildIndicesAnalyze (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildIndicesAnalyze (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.clear_cache.js

@@ -24,7 +24,7 @@
 
 function buildIndicesClearCache (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.clear_cache](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-clearcache.html) request
    *
@@ -95,17 +95,17 @@ function buildIndicesClearCache (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -124,34 +124,8 @@ function buildIndicesClearCache (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.close.js

@@ -24,7 +24,7 @@
 
 function buildIndicesClose (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.close](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-open-close.html) request
    *
@@ -86,17 +86,17 @@ function buildIndicesClose (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +111,8 @@ function buildIndicesClose (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.create.js

@@ -24,7 +24,7 @@
 
 function buildIndicesCreate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.create](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-create-index.html) request
    *
@@ -80,17 +80,17 @@ function buildIndicesCreate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -105,34 +105,8 @@ function buildIndicesCreate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.delete.js

@@ -24,7 +24,7 @@
 
 function buildIndicesDelete (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.delete](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-delete-index.html) request
    *
@@ -77,17 +77,17 @@ function buildIndicesDelete (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildIndicesDelete (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.delete_alias.js

@@ -24,7 +24,7 @@
 
 function buildIndicesDeleteAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.delete_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
@@ -88,17 +88,17 @@ function buildIndicesDeleteAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    var warnings = []
+    var { method, body, index, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -117,34 +117,8 @@ function buildIndicesDeleteAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.delete_template.js

@@ -24,7 +24,7 @@
 
 function buildIndicesDeleteTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.delete_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-templates.html) request
    *
@@ -77,17 +77,17 @@ function buildIndicesDeleteTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    var warnings = []
+    var { method, body, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildIndicesDeleteTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.exists.js

@@ -24,7 +24,7 @@
 
 function buildIndicesExists (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.exists](http://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-exists.html) request
    *
@@ -89,17 +89,17 @@ function buildIndicesExists (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildIndicesExists (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.exists_alias.js

@@ -24,7 +24,7 @@
 
 function buildIndicesExistsAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.exists_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
@@ -80,17 +80,17 @@ function buildIndicesExistsAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    var warnings = []
+    var { method, body, index, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -109,34 +109,8 @@ function buildIndicesExistsAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.exists_template.js

@@ -24,7 +24,7 @@
 
 function buildIndicesExistsTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.exists_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-templates.html) request
    *
@@ -80,17 +80,17 @@ function buildIndicesExistsTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    var warnings = []
+    var { method, body, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -105,34 +105,8 @@ function buildIndicesExistsTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.exists_type.js

@@ -24,7 +24,7 @@
 
 function buildIndicesExistsType (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.exists_type](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-types-exists.html) request
    *
@@ -94,17 +94,17 @@ function buildIndicesExistsType (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'HEAD'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -119,34 +119,8 @@ function buildIndicesExistsType (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.flush.js

@@ -24,7 +24,7 @@
 
 function buildIndicesFlush (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.flush](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-flush.html) request
    *
@@ -82,17 +82,17 @@ function buildIndicesFlush (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +111,8 @@ function buildIndicesFlush (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.flush_synced.js

@@ -24,7 +24,7 @@
 
 function buildIndicesFlushSynced (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.flush_synced](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-synced-flush.html) request
    *
@@ -77,17 +77,17 @@ function buildIndicesFlushSynced (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -106,34 +106,8 @@ function buildIndicesFlushSynced (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.forcemerge.js

@@ -24,7 +24,7 @@
 
 function buildIndicesForcemerge (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.forcemerge](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-forcemerge.html) request
    *
@@ -91,17 +91,17 @@ function buildIndicesForcemerge (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -120,34 +120,8 @@ function buildIndicesForcemerge (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.get.js

@@ -24,7 +24,7 @@
 
 function buildIndicesGet (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.get](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-index.html) request
    *
@@ -96,17 +96,17 @@ function buildIndicesGet (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, feature } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'feature'])
+    var warnings = []
+    var { method, body, index, feature, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -125,34 +125,8 @@ function buildIndicesGet (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.get_alias.js

@@ -24,7 +24,7 @@
 
 function buildIndicesGetAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.get_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
@@ -80,17 +80,17 @@ function buildIndicesGetAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    var warnings = []
+    var { method, body, index, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -113,34 +113,8 @@ function buildIndicesGetAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.get_field_mapping.js

@@ -24,7 +24,7 @@
 
 function buildIndicesGetFieldMapping (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.get_field_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-field-mapping.html) request
    *
@@ -88,17 +88,17 @@ function buildIndicesGetFieldMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type, fields } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type', 'fields'])
+    var warnings = []
+    var { method, body, index, type, fields, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -121,34 +121,8 @@ function buildIndicesGetFieldMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.get_mapping.js

@@ -24,7 +24,7 @@
 
 function buildIndicesGetMapping (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.get_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-mapping.html) request
    *
@@ -80,17 +80,17 @@ function buildIndicesGetMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -113,34 +113,8 @@ function buildIndicesGetMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.get_settings.js

@@ -24,7 +24,7 @@
 
 function buildIndicesGetSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.get_settings](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-get-settings.html) request
    *
@@ -86,17 +86,17 @@ function buildIndicesGetSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    var warnings = []
+    var { method, body, index, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -119,34 +119,8 @@ function buildIndicesGetSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.get_template.js

@@ -24,7 +24,7 @@
 
 function buildIndicesGetTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.get_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-templates.html) request
    *
@@ -76,17 +76,17 @@ function buildIndicesGetTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    var warnings = []
+    var { method, body, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -105,34 +105,8 @@ function buildIndicesGetTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.get_upgrade.js

@@ -24,7 +24,7 @@
 
 function buildIndicesGetUpgrade (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.get_upgrade](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-upgrade.html) request
    *
@@ -77,17 +77,17 @@ function buildIndicesGetUpgrade (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -106,34 +106,8 @@ function buildIndicesGetUpgrade (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.open.js

@@ -24,7 +24,7 @@
 
 function buildIndicesOpen (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.open](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-open-close.html) request
    *
@@ -86,17 +86,17 @@ function buildIndicesOpen (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +111,8 @@ function buildIndicesOpen (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.put_alias.js

@@ -24,7 +24,7 @@
 
 function buildIndicesPutAlias (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.put_alias](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
@@ -85,17 +85,17 @@ function buildIndicesPutAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    var warnings = []
+    var { method, body, index, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -114,34 +114,8 @@ function buildIndicesPutAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.put_mapping.js

@@ -24,7 +24,7 @@
 
 function buildIndicesPutMapping (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.put_mapping](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-put-mapping.html) request
    *
@@ -91,17 +91,17 @@ function buildIndicesPutMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -128,34 +128,8 @@ function buildIndicesPutMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.put_settings.js

@@ -24,7 +24,7 @@
 
 function buildIndicesPutSettings (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.put_settings](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-update-settings.html) request
    *
@@ -87,17 +87,17 @@ function buildIndicesPutSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildIndicesPutSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.put_template.js

@@ -24,7 +24,7 @@
 
 function buildIndicesPutTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.put_template](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-templates.html) request
    *
@@ -85,17 +85,17 @@ function buildIndicesPutTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, name } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    var warnings = []
+    var { method, body, name, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -110,34 +110,8 @@ function buildIndicesPutTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.recovery.js

@@ -24,7 +24,7 @@
 
 function buildIndicesRecovery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.recovery](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-recovery.html) request
    *
@@ -73,17 +73,17 @@ function buildIndicesRecovery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildIndicesRecovery (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.refresh.js

@@ -24,7 +24,7 @@
 
 function buildIndicesRefresh (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.refresh](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-refresh.html) request
    *
@@ -77,17 +77,17 @@ function buildIndicesRefresh (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -106,34 +106,8 @@ function buildIndicesRefresh (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.rollover.js

@@ -24,7 +24,7 @@
 
 function buildIndicesRollover (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.rollover](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-rollover-index.html) request
    *
@@ -87,17 +87,17 @@ function buildIndicesRollover (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, alias, newIndex, new_index } = params
-    var querystring = semicopy(params, ['method', 'body', 'alias', 'newIndex', 'new_index'])
+    var warnings = []
+    var { method, body, alias, newIndex, new_index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildIndicesRollover (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.segments.js

@@ -24,7 +24,7 @@
 
 function buildIndicesSegments (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.segments](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-segments.html) request
    *
@@ -82,17 +82,17 @@ function buildIndicesSegments (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +111,8 @@ function buildIndicesSegments (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.shard_stores.js

@@ -24,7 +24,7 @@
 
 function buildIndicesShardStores (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.shard_stores](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-shards-stores.html) request
    *
@@ -82,17 +82,17 @@ function buildIndicesShardStores (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -111,34 +111,8 @@ function buildIndicesShardStores (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.shrink.js

@@ -24,7 +24,7 @@
 
 function buildIndicesShrink (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.shrink](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-shrink-index.html) request
    *
@@ -88,17 +88,17 @@ function buildIndicesShrink (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, target } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'target'])
+    var warnings = []
+    var { method, body, index, target, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -113,34 +113,8 @@ function buildIndicesShrink (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.stats.js

@@ -24,7 +24,7 @@
 
 function buildIndicesStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.stats](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-stats.html) request
    *
@@ -86,17 +86,17 @@ function buildIndicesStats (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, metric } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'metric'])
+    var warnings = []
+    var { method, body, index, metric, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -119,34 +119,8 @@ function buildIndicesStats (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.update_aliases.js

@@ -24,7 +24,7 @@
 
 function buildIndicesUpdateAliases (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.update_aliases](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-aliases.html) request
    *
@@ -73,17 +73,17 @@ function buildIndicesUpdateAliases (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -98,34 +98,8 @@ function buildIndicesUpdateAliases (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.upgrade.js

@@ -24,7 +24,7 @@
 
 function buildIndicesUpgrade (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.upgrade](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/indices-upgrade.html) request
    *
@@ -83,17 +83,17 @@ function buildIndicesUpgrade (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -112,34 +112,8 @@ function buildIndicesUpgrade (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/indices.validate_query.js

@@ -24,7 +24,7 @@
 
 function buildIndicesValidateQuery (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.validate_query](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-validate.html) request
    *
@@ -103,17 +103,17 @@ function buildIndicesValidateQuery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -134,34 +134,8 @@ function buildIndicesValidateQuery (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/info.js

@@ -24,7 +24,7 @@
 
 function buildInfo (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [info](https://www.elastic.co/guide/) request
    *
@@ -67,17 +67,17 @@ function buildInfo (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -92,34 +92,8 @@ function buildInfo (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/ingest.delete_pipeline.js

@@ -24,7 +24,7 @@
 
 function buildIngestDeletePipeline (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ingest.delete_pipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/5.x/ingest.html) request
    *
@@ -77,17 +77,17 @@ function buildIngestDeletePipeline (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    var warnings = []
+    var { method, body, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'DELETE'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -102,34 +102,8 @@ function buildIngestDeletePipeline (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/ingest.get_pipeline.js

@@ -24,7 +24,7 @@
 
 function buildIngestGetPipeline (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ingest.get_pipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/5.x/ingest.html) request
    *
@@ -71,17 +71,17 @@ function buildIngestGetPipeline (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    var warnings = []
+    var { method, body, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -100,34 +100,8 @@ function buildIngestGetPipeline (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/ingest.processor_grok.js

@@ -24,7 +24,7 @@
 
 function buildIngestProcessorGrok (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ingest.processor_grok](https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html) request
    *
@@ -67,17 +67,17 @@ function buildIngestProcessorGrok (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    var warnings = []
+    var { method, body, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -92,34 +92,8 @@ function buildIngestProcessorGrok (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/ingest.put_pipeline.js

@@ -24,7 +24,7 @@
 
 function buildIngestPutPipeline (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ingest.put_pipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/5.x/ingest.html) request
    *
@@ -78,17 +78,17 @@ function buildIngestPutPipeline (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    var warnings = []
+    var { method, body, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'PUT'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -103,34 +103,8 @@ function buildIngestPutPipeline (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/ingest.simulate.js

@@ -24,7 +24,7 @@
 
 function buildIngestSimulate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ingest.simulate](https://www.elastic.co/guide/en/elasticsearch/plugins/5.x/ingest.html) request
    *
@@ -71,17 +71,17 @@ function buildIngestSimulate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, id } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    var warnings = []
+    var { method, body, id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -100,34 +100,8 @@ function buildIngestSimulate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/mget.js

@@ -24,7 +24,7 @@
 
 function buildMget (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [mget](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-multi-get.html) request
    *
@@ -95,17 +95,17 @@ function buildMget (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -126,34 +126,8 @@ function buildMget (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/mpercolate.js

@@ -24,7 +24,7 @@
 
 function buildMpercolate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [mpercolate](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-percolate.html) request
    *
@@ -85,17 +85,17 @@ function buildMpercolate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildMpercolate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/msearch.js

@@ -24,7 +24,7 @@
 
 function buildMsearch (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [msearch](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/search-multi-search.html) request
    *
@@ -88,17 +88,17 @@ function buildMsearch (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -119,34 +119,8 @@ function buildMsearch (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/msearch_template.js

@@ -24,7 +24,7 @@
 
 function buildMsearchTemplate (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [msearch_template](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html) request
    *
@@ -85,17 +85,17 @@ function buildMsearchTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildMsearchTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/mtermvectors.js

@@ -24,7 +24,7 @@
 
 function buildMtermvectors (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [mtermvectors](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/docs-multi-termvectors.html) request
    *
@@ -99,17 +99,17 @@ function buildMtermvectors (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, index, type } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    var warnings = []
+    var { method, body, index, type, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = body == null ? 'GET' : 'POST'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -130,34 +130,8 @@ function buildMtermvectors (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }
 

api/api/nodes.hot_threads.js

@@ -24,7 +24,7 @@
 
 function buildNodesHotThreads (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [nodes.hot_threads](https://www.elastic.co/guide/en/elasticsearch/reference/5.x/cluster-nodes-hot-threads.html) request
    *
@@ -81,17 +81,17 @@ function buildNodesHotThreads (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
-    var { method, body, nodeId, node_id } = params
-    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
+    var warnings = []
+    var { method, body, nodeId, node_id, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
       method = 'GET'
     }
 
-    var ignore = options.ignore || null
+    var ignore = options.ignore
     if (typeof ignore === 'number') {
-      ignore = [ignore]
+      options.ignore = [ignore]
     }
 
     var path = ''
@@ -116,34 +116,8 @@ function buildNodesHotThreads (opts) {
       querystring
     }
 
-    const requestOptions = {
-      ignore,
-      requestTimeout: options.requestTimeout || null,
-      maxRetries: options.maxRetries || null,
-      asStream: options.asStream || false,
-      headers: options.headers || null,
-      querystring: options.querystring || null,
-      compression: options.compression || false,
-      warnings
-    }
-
-    return makeRequest(request, requestOptions, callback)
-
-    function semicopy (obj, exclude) {
-      var target = {}
-      var keys = Object.keys(obj)
-      for (var i = 0, len = keys.length; i < len; i++) {
-        var key = keys[i]
-        if (exclude.indexOf(key) === -1) {
-          target[snakeCase[key] || key] = obj[key]
-          if (acceptedQuerystring.indexOf(snakeCase[key] || key) === -1) {
-            warnings = warnings || []
-            warnings.push('Client - Unknown parameter: "' + key + '", sending it as query parameter')
-          }
-        }
-      }
-      return target
-    }
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
   }
 }