Bumped v6.8.5

* Fix #1069

* Updated test

* Updated test

.ci/docker-compose.yml

@@ -22,7 +22,7 @@ services:
       - elasticsearch-oss
 
   elasticsearch-oss:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1}
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:${ELASTICSEARCH_VERSION:-6.6.2}
     volumes:
       - esvol:/tmp
     networks:
@@ -58,7 +58,7 @@ services:
     command: ["npm", "run", "test:integration"]
 
   elasticsearch-platinum:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-6.6.2}
     ports:
       - "9200:9200"
     networks:

.ci/docker/Dockerfile

@@ -0,0 +1,7 @@
+ARG NODE_JS_VERSION=10
+FROM node:${NODE_JS_VERSION}-alpine
+
+RUN apk --no-cache add git
+
+# Create app directory
+WORKDIR /usr/src/app

.ci/jobs/defaults.yml

@@ -47,6 +47,10 @@
         type: yaml
         filename: .ci/test-matrix.yml
         name: NODE_JS_VERSION
+    - axis:
+        type: yaml
+        filename: .ci/test-matrix.yml
+        name: TEST_SUITE
     yaml-strategy:
       exclude-key: exclude
       filename: .ci/test-matrix.yml
@@ -65,3 +69,6 @@
     publishers:
     - email:
         recipients: infra-root+build@elastic.co
+    # - junit:
+    #     results: "*-junit.xml"
+    #     allow-empty-results: true

.ci/packer_cache.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+source /usr/local/bin/bash_standard_lib.sh
+
+DOCKER_IMAGES="node:12-alpine
+node:10-alpine
+node:8-alpine
+"
+
+for di in ${DOCKER_IMAGES}
+do
+(retry 2 docker pull "${di}") || echo "Error pulling ${di} Docker image, we continue"
+done
+

.ci/run-elasticsearch.sh

@@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+#
+# Launch one or more Elasticsearch nodes via the Docker image,
+# to form a cluster suitable for running the REST API tests.
+#
+# Export the ELASTICSEARCH_VERSION variable, eg. 'elasticsearch:8.0.0-SNAPSHOT'.
+
+if [[ -z "$ELASTICSEARCH_VERSION" ]]; then
+  echo -e "\033[31;1mERROR:\033[0m Required environment variable [ELASTICSEARCH_VERSION] not set\033[0m"
+  exit 1
+fi
+
+set -euxo pipefail
+
+moniker=$(echo "$ELASTICSEARCH_VERSION" | tr -C "[:alnum:]" '-')
+suffix=rest-test
+
+NODE_NAME=${NODE_NAME-${moniker}node1}
+MASTER_NODE_NAME=${MASTER_NODE_NAME-${NODE_NAME}}
+CLUSTER_NAME=${CLUSTER_NAME-${moniker}${suffix}}
+HTTP_PORT=${HTTP_PORT-9200}
+
+ELASTIC_PASSWORD=${ELASTIC_PASSWORD-changeme}
+SSL_CERT=${SSL_CERT-"$PWD/certs/testnode.crt"}
+SSL_KEY=${SSL_KEY-"$PWD/certs/testnode.key"}
+SSL_CA=${SSL_CA-"$PWD/certs/ca.crt"}
+
+DETACH=${DETACH-false}
+CLEANUP=${CLEANUP-false}
+
+volume_name=${NODE_NAME}-${suffix}-data
+network_default=${moniker}${suffix}
+NETWORK_NAME=${NETWORK_NAME-"$network_default"}
+
+set +x
+
+function cleanup_volume {
+  if [[ "$(docker volume ls -q -f name=$1)" ]]; then
+    echo -e "\033[34;1mINFO:\033[0m Removing volume $1\033[0m"
+    (docker volume rm "$1") || true
+  fi
+}
+function cleanup_node {
+  if [[ "$(docker ps -q -f name=$1)" ]]; then
+    echo -e "\033[34;1mINFO:\033[0m Removing container $1\033[0m"
+    (docker container rm --force --volumes "$1") || true
+    cleanup_volume "$1-${suffix}-data"
+  fi
+}
+function cleanup_network {
+  if [[ "$(docker network ls -q -f name=$1)" ]]; then
+    echo -e "\033[34;1mINFO:\033[0m Removing network $1\033[0m"
+    (docker network rm "$1") || true
+  fi
+}
+
+function cleanup {
+  if [[ "$DETACH" != "true" ]] || [[ "$1" == "1" ]]; then
+    echo -e "\033[34;1mINFO:\033[0m clean the node and volume on startup (1) OR on exit if not detached\033[0m"
+    cleanup_node "$NODE_NAME"
+  fi
+  if [[ "$DETACH" != "true" ]]; then
+    echo -e "\033[34;1mINFO:\033[0m clean the network if not detached (start and exit)\033[0m"
+    cleanup_network "$NETWORK_NAME"
+  fi
+};
+trap "cleanup 0" EXIT
+
+if [[ "$CLEANUP" == "true" ]]; then
+  trap - EXIT
+  if [[ -z "$(docker network ls -q -f name=${NETWORK_NAME})" ]]; then
+    echo -e "\033[34;1mINFO:\033[0m $NETWORK_NAME is already deleted\033[0m"
+    exit 0
+  fi
+  containers=$(docker network inspect -f '{{ range $key, $value := .Containers }}{{ printf "%s\n" .Name}}{{ end }}' ${NETWORK_NAME})
+  while read -r container; do
+    cleanup_node "$container"
+  done <<< "$containers"
+  cleanup_network "$NETWORK_NAME"
+  echo -e "\033[32;1mSUCCESS:\033[0m Cleaned up and exiting\033[0m"
+  exit 0
+fi
+
+echo -e "\033[34;1mINFO:\033[0m Making sure previous run leftover infrastructure is removed \033[0m"
+cleanup 1
+
+echo -e "\033[34;1mINFO:\033[0m Creating network $NETWORK_NAME if it does not exist already \033[0m"
+docker network inspect "$NETWORK_NAME" > /dev/null 2>&1 || docker network create "$NETWORK_NAME"
+
+environment=($(cat <<-END
+  --env node.name=$NODE_NAME
+  --env cluster.name=$CLUSTER_NAME
+  --env cluster.routing.allocation.disk.threshold_enabled=false
+  --env bootstrap.memory_lock=true
+  --env node.attr.testattr=test
+  --env path.repo=/tmp
+  --env repositories.url.allowed_urls=http://snapshot.test*
+END
+))
+
+volumes=($(cat <<-END
+  --volume $volume_name:/usr/share/elasticsearch/data
+END
+))
+
+if [[ "$ELASTICSEARCH_VERSION" != *oss* ]]; then
+  environment+=($(cat <<-END
+    --env ELASTIC_PASSWORD=$ELASTIC_PASSWORD
+    --env xpack.license.self_generated.type=trial
+    --env xpack.security.enabled=true
+    --env xpack.security.http.ssl.enabled=true
+    --env xpack.security.http.ssl.verification_mode=certificate
+    --env xpack.security.http.ssl.key=certs/testnode.key
+    --env xpack.security.http.ssl.certificate=certs/testnode.crt
+    --env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
+    --env xpack.security.transport.ssl.enabled=true
+    --env xpack.security.transport.ssl.key=certs/testnode.key
+    --env xpack.security.transport.ssl.certificate=certs/testnode.crt
+    --env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
+END
+))
+  volumes+=($(cat <<-END
+    --volume $SSL_CERT:/usr/share/elasticsearch/config/certs/testnode.crt
+    --volume $SSL_KEY:/usr/share/elasticsearch/config/certs/testnode.key
+    --volume $SSL_CA:/usr/share/elasticsearch/config/certs/ca.crt
+END
+))
+fi
+
+url="http://$NODE_NAME"
+if [[ "$ELASTICSEARCH_VERSION" != *oss* ]]; then
+  url="https://elastic:$ELASTIC_PASSWORD@$NODE_NAME"
+fi
+
+echo -e "\033[34;1mINFO:\033[0m Starting container $NODE_NAME \033[0m"
+set -x
+docker run \
+  --name "$NODE_NAME" \
+  --network "$NETWORK_NAME" \
+  --env ES_JAVA_OPTS=-"Xms1g -Xmx1g" \
+  "${environment[@]}" \
+  "${volumes[@]}" \
+  --publish "$HTTP_PORT":9200 \
+  --ulimit nofile=65536:65536 \
+  --ulimit memlock=-1:-1 \
+  --detach="$DETACH" \
+  --health-cmd="curl --silent --insecure --fail $url:9200/_cluster/health || exit 1" \
+  --health-interval=2s \
+  --health-retries=20 \
+  --health-timeout=2s \
+  --rm \
+  docker.elastic.co/elasticsearch/"$ELASTICSEARCH_VERSION";
+set +x
+
+if [[ "$DETACH" == "true" ]]; then
+  until [[ "$(docker inspect -f "{{.State.Health.Status}}" ${NODE_NAME})" != "starting" ]]; do
+    sleep 2;
+    echo ""
+    echo -e "\033[34;1mINFO:\033[0m waiting for node $NODE_NAME to be up\033[0m"
+  done;
+  # Always show the node getting started logs, this is very useful both on CI as well as while developing
+  docker logs "$NODE_NAME"
+  if [[ "$(docker inspect -f "{{.State.Health.Status}}" ${NODE_NAME})" != "healthy" ]]; then
+    cleanup 1
+    echo
+    echo -e "\033[31;1mERROR:\033[0m Failed to start ${ELASTICSEARCH_VERSION} in detached mode beyond health checks\033[0m"
+    echo -e "\033[31;1mERROR:\033[0m dumped the docker log before shutting the node down\033[0m"
+    exit 1
+  else
+    echo
+    echo -e "\033[32;1mSUCCESS:\033[0m Detached and healthy: ${NODE_NAME} on docker network: ${NETWORK_NAME}\033[0m"
+    echo -e "\033[32;1mSUCCESS:\033[0m Running on: ${url/$NODE_NAME/localhost}:${HTTP_PORT}\033[0m"
+    exit 0
+  fi
+fi

.ci/run-tests

@@ -8,6 +8,7 @@
 #
 #   - $ELASTICSEARCH_VERSION
 #   - $NODE_JS_VERSION
+#   - $TEST_SUITE
 #
 
 set -eo pipefail
@@ -18,93 +19,41 @@ export CODECOV_TOKEN=$(vault read -field=token secret/clients-ci/elasticsearch-j
 unset VAULT_ROLE_ID VAULT_SECRET_ID VAULT_TOKEN
 set -x
 
-function cleanup {
-  docker container rm --force --volumes elasticsearch-oss > /dev/null 2>&1 || true
-  docker container rm --force --volumes elasticsearch-platinum > /dev/null 2>&1 || true
-  docker container rm --force --volumes elasticsearch-js-oss > /dev/null 2>&1 || true
-  docker container rm --force --volumes elasticsearch-js-platinum > /dev/null 2>&1 || true
-  docker network rm esnet-oss > /dev/null
-  docker network rm esnet-platinum > /dev/null
-}
-
-trap cleanup EXIT
-
-# create network and volume
-docker network create esnet-oss
-docker network create esnet-platinum
-
-# create client image
 docker build \
   --file .ci/Dockerfile \
   --tag elastic/elasticsearch-js \
   --build-arg NODE_JS_VERSION=${NODE_JS_VERSION} \
   .
 
-# run elasticsearch oss
+NODE_NAME="es1"
-docker run \
-  --rm \
-  --env "node.attr.testattr=test" \
-  --env "path.repo=/tmp" \
-  --env "repositories.url.allowed_urls=http://snapshot.*" \
-  --env "discovery.type=single-node" \
-  --network=esnet-oss \
-  --name=elasticsearch-oss \
-  --detach \
-  docker.elastic.co/elasticsearch/elasticsearch-oss:${ELASTICSEARCH_VERSION}
-
-# run elasticsearch platinum
 repo=$(pwd)
 testnodecrt="/.ci/certs/testnode.crt"
 testnodekey="/.ci/certs/testnode.key"
 cacrt="/.ci/certs/ca.crt"
 
-docker run \
+elasticsearch_image="elasticsearch"
-  --rm \
+elasticsearch_url="https://elastic:changeme@${NODE_NAME}:9200"
-  --env "node.attr.testattr=test" \
+if [[ $TEST_SUITE != "xpack" ]]; then
-  --env "path.repo=/tmp" \
+  elasticsearch_image="elasticsearch-oss"
-  --env "repositories.url.allowed_urls=http://snapshot.*" \
+  elasticsearch_url="http://${NODE_NAME}:9200"
-  --env "discovery.type=single-node" \
+fi
-  --env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
+
-  --env "ELASTIC_PASSWORD=changeme" \
+ELASTICSEARCH_VERSION="${elasticsearch_image}:${ELASTICSEARCH_VERSION}" \
-  --env "xpack.security.enabled=true" \
+  NODE_NAME="${NODE_NAME}" \
-  --env "xpack.license.self_generated.type=trial" \
+  NETWORK_NAME="esnet" \
-  --env "xpack.security.http.ssl.enabled=true" \
+  DETACH=true \
-  --env "xpack.security.http.ssl.verification_mode=certificate" \
+  SSL_CERT="${repo}${testnodecrt}" \
-  --env "xpack.security.http.ssl.key=certs/testnode.key" \
+  SSL_KEY="${repo}${testnodekey}" \
-  --env "xpack.security.http.ssl.certificate=certs/testnode.crt" \
+  SSL_CA="${repo}${cacrt}" \
-  --env "xpack.security.http.ssl.certificate_authorities=certs/ca.crt" \
+  bash .ci/run-elasticsearch.sh
-  --env "xpack.security.transport.ssl.enabled=true" \
-  --env "xpack.security.transport.ssl.key=certs/testnode.key" \
-  --env "xpack.security.transport.ssl.certificate=certs/testnode.crt" \
-  --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt" \
-  --volume "$repo$testnodecrt:/usr/share/elasticsearch/config/certs/testnode.crt" \
-  --volume "$repo$testnodekey:/usr/share/elasticsearch/config/certs/testnode.key" \
-  --volume "$repo$cacrt:/usr/share/elasticsearch/config/certs/ca.crt" \
-  --network=esnet-platinum \
-  --name=elasticsearch-platinum \
-  --detach \
-  docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}
 
-# run the client unit and oss integration test
 docker run \
-  --network=esnet-oss \
+  --network=esnet \
-  --env "TEST_ES_SERVER=http://elasticsearch-oss:9200" \
+  --env "TEST_ES_SERVER=${elasticsearch_url}" \
   --env "CODECOV_TOKEN" \
   --volume $repo:/usr/src/app \
   --volume /usr/src/app/node_modules \
-  --name elasticsearch-js-oss \
+  --name elasticsearch-js \
   --rm \
   elastic/elasticsearch-js \
   npm run ci
-
-# run the client platinium integration test
-docker run \
-  --network=esnet-platinum \
-  --env "TEST_ES_SERVER=https://elastic:changeme@elasticsearch-platinum:9200" \
-  --volume $repo:/usr/src/app \
-  --volume /usr/src/app/node_modules \
-  --name elasticsearch-js-platinum \
-  --rm \
-  elastic/elasticsearch-js \
-  npm run test:integration
-

.ci/test-matrix.yml

@@ -1,11 +1,14 @@
 ---
 ELASTICSEARCH_VERSION:
-- 7.0.0-beta1
+  - 6.8.4
 
 NODE_JS_VERSION:
-- 11
+  - 12
-- 10
+  - 10
-- 8
+  - 8
-- 6
+
+TEST_SUITE:
+  - oss
+  - xpack
 
 exclude: ~

.gitignore

@@ -50,8 +50,6 @@ package-lock.json
 # elasticsearch repo or binary files
 elasticsearch*
 
-# Generated typings, we don't commit them
-# because we should copy them in the main .d.ts file
-api/generated.d.ts
-
 test/benchmarks/macro/fixtures/*
+
+*-junit.xml

.npmignore

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

.travis.yml

@@ -1,29 +1,25 @@
-dist: trusty
-
-sudo: required
-
 language: node_js
 
 node_js:
+  - "12"
   - "10"
   - "8"
-  - "6"
 
-env:
+cache:
-  global:
+  npm: false
-    - ELASTICSEARCH_VERSION=7.0.0-beta1
-    - QUIET=true
 
-before_install:
+os:
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}-linux-x86_64.tar.gz
+  - windows
-  - tar -xzf elasticsearch-${ELASTICSEARCH_VERSION}-linux-x86_64.tar.gz
+  - linux
-  - ./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
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then npm run license-checker; fi
+  - npm run lint
+  - npm run test:coverage
+  - npm run test:types
 
 notifications:
   email:

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+303 See Other
+
+Location: https://www.elastic.co/community/codeofconduct

CONTRIBUTING.md

@@ -0,0 +1,100 @@
+# Contributing to the Elasticsearch Node.js client
+
+The Elasticsearch Node.js client is open source and we love to receive contributions from our community — you!
+
+There are many ways to contribute,
+from writing tutorials or blog posts,
+improving the documentation,
+submitting bug reports and feature requests or writing code.
+
+## Repository structure
+The `master` branch is considered unstable, and it's compatible with Elasticsearch master. Unless you are patching an issue, new features should always be sent to the `master` branch, in case of a bugfix, it depends if the bug affects all the release lines.<br/>
+There is a branch for every supported release line, such as `7.x` or `6.x`. We release bugfixes as soon as possible, while minor and major releases are published at the same time of the Elastic Stack.
+
+Usually for every release line there will be a *published* version and a *next* version. Eg: the `7.x` branch contains the version published on npm, and bugfixes should be sent there, while `7.2` *(assuming that 7.1.x is released)* contains the next version, and new features should be sent there.
+
+## Code contributions
+
+If you have a bugfix or new feature that you would like to contribute,
+please find or open an issue about it first.
+Talk about what you would like to do.
+It may be that somebody is already working on it,
+or that there are particular issues that you should know about before implementing the change.
+
+Note that we strictly follow the [Elastic EOL schedule](https://www.elastic.co/support/eol).
+
+### Submitting your changes
+
+Generally, we require that you test any code you are adding or modifying.
+Once your changes are ready to submit for review:
+
+1. Test your changes
+
+    Run the test suite to make sure that nothing is broken.
+    Usually run `npm test` is enough, our CI will take care of running the integration test. If you want to run the integration test yourself, see the *Testing* section below.
+
+2. Submit a pull request
+
+    Push your local changes to your forked copy of the repository and [submit a pull request](https://help.github.com/articles/using-pull-requests).
+    In the pull request,
+    choose a title which sums up the changes that you have made,
+    and in the body provide more details about what your changes do.
+    Also mention the number of the issue where discussion has taken place,
+    eg "Closes #123".
+
+3. Sign the Contributor License Agreement
+
+    Please make sure you have signed our [Contributor License Agreement](https://www.elastic.co/contributor-agreement/).
+    We are not asking you to assign copyright to us,
+    but to give us the right to distribute your code without restriction.
+    We ask this of all contributors in order to assure our users of the origin and continuing existence of the code.
+    You only need to sign the CLA once.
+
+4. Be patient
+
+    We might not be able to review your code as fast as we would like to,
+    but we'll do our best to dedicate it the attention it deserves.
+    Your effort is much appreciated!
+
+### Code generation
+
+The entire content of the API folder is generated as well as the `docs/reference.asciidoc` file.<br/>
+If you want to run the code generation you should run the following command:
+```sh
+node scripts/generate --tag <tag name>
+# or
+node scripts/generate --branch <branch name>
+```
+Then you should copy the content of `api/generated.d.ts` into the `index.d.ts` file *(automate this step would be a nice pr!)*.
+
+### Testing
+There are different test scripts, usually during development you only need to run `npm test`, but if you want you can run just a part of the suite, following you will find all the testing scripts and what they do.
+
+| Script | Description |
+|---|---|
+| `npm run test:unit` | Runs the content of the `test/unit` folder. |
+| `npm run test:behavior` | Runs the content of the `test/behavior` folder. |
+| `npm run test:types` | Runs the content of the `test/types` folder. |
+| `npm run test:unit -- --cov --coverage-report=html` | Runs the content of the `test/unit` folder and calculates the code coverage. |
+| `npm run test:integration` | Runs the integration test runner.<br/>*Note: it requires a living instance of Elasticsearch.* |
+| `npm run lint` | Run the [linter](https://standardjs.com/). |
+| `npm run lint:fix` | Fixes the lint errors. |
+| `npm test` | Runs lint, unit, behavior, and types test. |
+
+#### Integration test
+The integration test are generated on the fly by the runner you will find inside `test/integration`, once you execute it, it will clone the Elasticsearch repository and checkout the correct version to grab the [OSS yaml files](https://github.com/elastic/elasticsearch/tree/master/rest-api-spec/src/main/resources/rest-api-spec/test) and the [Elastic licensed yaml files](https://github.com/elastic/elasticsearch/tree/master/x-pack/plugin/src/test/resources/rest-api-spec/test) that will be used for generating the test.
+
+Usually this step is executed by CI since it takes some time, but you can easily run this yourself! Just follow this steps:
+1. Boot an Elasticsearch instance, you can do that by running `./scripts/es-docker.sh` or `./scripts/es-docker-platinum.sh`, the first one will work only with the OSS APIs, while the second will work also with the Elastic licensed APIs;
+1. If you are running the OSS test, you should use `npm run test:integration`, otherwise use `TEST_ES_SERVER=https://elastic:changeme@localhost:9200 npm run test:integration`. You can also pass a `-b` parameter if you want the test to bail out at the first failure: `npm run test:integration -- -b`;
+1. Grab a coffee, it will take some time ;)
+
+### Releasing
+
+If you have access to make releases, the process is as follows:
+
+1. Update the version in `package.json` according to the scale of the change. (major, minor or patch)
+1. Commit changes with message `Bumped vx.y.z` where `x.y.z` is the version in `package.json`
+1. Create a release via the GitHub UI.
+1. Wait for CI to finish running the test.
+1. Publish to npm with `npm publish` *(see [publish](https://docs.npmjs.com/cli/publish) and [dist-tag](https://docs.npmjs.com/cli/dist-tag) docs)*

README.md

@@ -1,24 +1,24 @@
 <img align="right" width="auto" height="auto" src="https://www.elastic.co/static-res/images/elastic-logo-200.png">
 
-# @elastic/elasticsearch
+# Elasticsearch Node.js client
 
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)  [![Build Status](https://clients-ci.elastic.co/job/elastic+elasticsearch-js+master/badge/icon)](https://clients-ci.elastic.co/job/elastic+elasticsearch-js+master/)  [![codecov](https://codecov.io/gh/elastic/elasticsearch-js/branch/master/graph/badge.svg)](https://codecov.io/gh/elastic/elasticsearch-js)  [![NPM downloads](https://img.shields.io/npm/dm/@elastic/elasticsearch.svg?style=flat)](https://www.npmjs.com/package/@elastic/elasticsearch)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)  [![Build Status](https://clients-ci.elastic.co/buildStatus/icon?job=elastic%2Belasticsearch-js%2Bmaster)](https://clients-ci.elastic.co/view/Javascript/job/elastic+elasticsearch-js+master/)  [![codecov](https://codecov.io/gh/elastic/elasticsearch-js/branch/master/graph/badge.svg)](https://codecov.io/gh/elastic/elasticsearch-js)  [![NPM downloads](https://img.shields.io/npm/dm/@elastic/elasticsearch.svg?style=flat)](https://www.npmjs.com/package/@elastic/elasticsearch)
-
----
-
-**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).
-
----
 
 The official Node.js client for Elasticsearch.
 
+---
+
+**Note:** In the past months we have worked on the new Elasticsearch Node.js client and you can use it by following the instructions below. If you're going to use the legacy one or report an issue, however, please check out [elastic/elasticsearch-js-legacy](https://github.com/elastic/elasticsearch-js-legacy).
+
+---
+
 ## Features
 - One-to-one mapping with REST API.
 - Generalized, pluggable architecture.
 - Configurable, automatic discovery of cluster nodes.
 - Persistent, Keep-Alive connections.
-- Load balancing (with pluggable selection strategy) across all available nodes.
+- Load balancing across all available nodes.
+- Child client support.
 - TypeScript support out of the box.
 
 ## Install
@@ -28,30 +28,51 @@ npm install @elastic/elasticsearch
 
 ### Compatibility
 
----
+The minimum supported version of Node.js is `v8`.
 
-**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 library is compatible with all Elasticsearch versions since 5.x, and you should use the same major version of the Elasticsearch instance that you are using.
 
----
+| Elasticsearch Version | Client Version |
+| --------------------- |----------------|
+| `master`              | `master`       |
+| `7.x`                 | `7.x`          |
+| `6.x`                 | `6.x`          |
+| `5.x`                 | `5.x`          |
 
-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.
+To install a specific major of the client, run the following command:
 ```
-# Elasticsearch 7.x
+npm install @elastic/elasticsearch@<major>
-@elastic/elasticsearch@7
-
-# Elasticsearch 6.x
-@elastic/elasticsearch@6
-
-# Elasticsearch 5.x
-@elastic/elasticsearch@5
 ```
 
-## Usage
+#### Browser
-You can find the full documentation in the [docs](https://github.com/elastic/elasticsearch-js/tree/master/docs) folder.
+
+WARNING: There is no official support for the browser environment. It exposes your Elasticsearch instance to everyone, which could lead to security issues.
+We recommend that you write a lightweight proxy that uses this client instead.
+
+## Documentation
+
+- [Introduction](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/introduction.html)
+- [Usage](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/client-usage.html)
+- [Client configuration](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/client-configuration.html)
+- [API reference](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/api-reference.html)
+- [Breaking changes coming from the old client](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/breaking-changes.html)
+- [Authentication](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/auth-reference.html)
+- [Observability](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/observability.html)
+- [Creating a child client](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/child-client.html)
+- [Extend the client](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/extend-client.html)
+- [Typescript support](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/typescript.html)
+- [Examples](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/examples.html)
+
+## Quick start
+
+First of all, require the client and initialize it:
 ```js
 const { Client } = require('@elastic/elasticsearch')
 const client = new Client({ node: 'http://localhost:9200' })
+```
 
+You can use both the callback-style API and the promise-style API, both behave the same way.
+```js
 // promise API
 const result = await client.search({
   index: 'my-index',
@@ -76,77 +97,99 @@ The returned value of **every** API call is formed as follows:
   meta: object
 }
 ```
-### 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.
+Let's see a complete example!
-```ts
+```js
-{
+'use strict'
-  // the Elasticsearch endpoint to use
+
-  node: string | string[];
+const { Client } = require('@elastic/elasticsearch')
-  // alias of above
+const client = new Client({ node: 'http://localhost:9200' })
-  nodes: string | string[];
+
-  // custom connection class
+async function run () {
-  Connection: typeof Connection;
+  // Let's start by indexing some data
-  // custom connection pool class
+  await client.index({
-  ConnectionPool: typeof ConnectionPool;
+    index: 'game-of-thrones',
-  // custom transport class
+    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
-  Transport: typeof Transport;
+    body: {
-  // custom serializer class
+      character: 'Ned Stark',
-  Serializer: typeof Serializer;
+      quote: 'Winter is coming.'
-  // max number of retries for each request
+    }
-  maxRetries: number;
+  })
-  // max request timeout for each request
+
-  requestTimeout: number;
+  await client.index({
-  // max ping timeout for each request
+    index: 'game-of-thrones',
-  pingTimeout: number;
+    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
-  // perform a sniff operation every `n` milliseconds
+    body: {
-  sniffInterval: number;
+      character: 'Daenerys Targaryen',
-  // perform a sniff once the client is started
+      quote: 'I am the blood of the dragon.'
-  sniffOnStart: boolean;
+    }
-  // custom sniff endpoint, defaults `_nodes/_all/http`
+  })
-  sniffEndpoint: string;
+
-  // perform a sniff on connection fault
+  await client.index({
-  sniffOnConnectionFault: boolean;
+    index: 'game-of-thrones',
-  // configurethe node resurrection strategy, default `ping`
+    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
-  resurrectStrategy: 'ping' | 'optimistic' | 'none';
+    body: {
-  // adds `accept-encoding` header to every request
+      character: 'Tyrion Lannister',
-  suggestCompression: boolean;
+      quote: 'A mind needs books like a sword needs a whetstone.'
-  // enable gzip request body compression
+    }
-  compression: 'gzip';
+  })
-  // ssl configuraton
+
-  ssl: http.SecureContextOptions;
+  // here we are forcing an index refresh, otherwise we will not
-  // http agent options
+  // get any result in the consequent search
-  agent: http.AgentOptions;
+  await client.indices.refresh({ index: 'game-of-thrones' })
-  // filters which node not to use for a request
+
-  nodeFilter: nodeFilterFn;
+  // Let's search!
-  // custom selection strategy, defaults `round-robin`
+  const { body } = await client.search({
-  nodeSelector: nodeSelectorFn | string;
+    index: 'game-of-thrones',
+    // type: '_doc', // uncomment this line if you are using Elasticsearch ≤ 6
+    body: {
+      query: {
+        match: { quote: 'winter' }
+      }
+    }
+  })
+
+  console.log(body.hits.hits)
 }
+
+run().catch(console.log)
 ```
 
-### Request specific options
+## Install multiple versions
-If needed you can pass request specific options in a second object:
+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.
-```js
+
-// promise API
+The command you must run to install different version of the client is:
-const result = await client.search({
+```sh
-  index: 'my-index',
+npm install <alias>@npm:@elastic/elasticsearch@<version>
-  body: { foo: 'bar' }
-}, {
-  ignore: [404],
-  maxRetries: 3
-})
 ```
-The supported *request specific options* are:
+So for example if you need to install `7.x` and `6.x`, you will run
-```ts
+```sh
-{
+npm install es6@npm:@elastic/elasticsearch@6
-  ignore: [number], // default `null`
+npm install es7@npm:@elastic/elasticsearch@7
-  requestTimeout: number, // client default
+```
-  maxRetries: number, // default `5`
+And your `package.json` will look like the following:
-  asStream: boolean, // default `false`
+```json
-  compression: string, // default `false`
+"dependencies": {
-  headers: object, // default `null`
+  "es6": "npm:@elastic/elasticsearch@^6.7.0",
-  querystring: object // default `null`
+  "es7": "npm:@elastic/elasticsearch@^7.0.0"
 }
 ```
+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
+```
 
 ## License
 

api/api/bulk.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html) request
    *
@@ -35,6 +20,7 @@ function buildBulk (opts) {
    * @param {string} routing - Specific routing value
    * @param {time} timeout - Explicit operation timeout
    * @param {string} type - Default document type for items which don't provide one
+   * @param {list} fields - Default comma-separated list of fields to return in the response for updates, can be overridden on each sub-request
    * @param {list} _source - True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request
    * @param {list} _source_excludes - Default list of fields to exclude from the returned _source field, can be overridden on each sub-request
    * @param {list} _source_includes - Default list of fields to extract and return from the _source field, can be overridden on each sub-request
@@ -48,9 +34,12 @@ function buildBulk (opts) {
     'routing',
     'timeout',
     'type',
+    'fields',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'pipeline',
     'pretty',
     'human',
@@ -62,7 +51,9 @@ function buildBulk (opts) {
   const snakeCase = {
     waitForActiveShards: 'wait_for_active_shards',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -97,17 +88,17 @@ function buildBulk (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    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 = ''
@@ -128,34 +119,8 @@ function buildBulk (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.aliases.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html) request
    *
@@ -83,17 +68,17 @@ function buildCatAliases (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 +97,8 @@ function buildCatAliases (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.allocation.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html) request
    *
@@ -85,17 +70,17 @@ function buildCatAllocation (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, nodeId, node_id } = params
+    var { method, body, nodeId, node_id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
+    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 +99,8 @@ function buildCatAllocation (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.count.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html) request
    *
@@ -83,17 +68,17 @@ function buildCatCount (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +97,8 @@ function buildCatCount (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.fielddata.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html) request
    *
@@ -87,17 +72,17 @@ function buildCatFielddata (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, fields } = params
+    var { method, body, fields, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'fields'])
+    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 +101,8 @@ function buildCatFielddata (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.health.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html) request
    *
@@ -84,17 +69,17 @@ function buildCatHealth (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +94,8 @@ function buildCatHealth (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.help.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html) request
    *
@@ -71,17 +56,17 @@ function buildCatHelp (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +81,8 @@ function buildCatHelp (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.indices.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html) request
    *
@@ -89,17 +74,17 @@ function buildCatIndices (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +103,8 @@ function buildCatIndices (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.master.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html) request
    *
@@ -82,17 +67,17 @@ function buildCatMaster (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +92,8 @@ function buildCatMaster (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.nodeattrs.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html) request
    *
@@ -82,17 +67,17 @@ function buildCatNodeattrs (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +92,8 @@ function buildCatNodeattrs (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.nodes.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html) request
    *
@@ -85,17 +70,17 @@ function buildCatNodes (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +95,8 @@ function buildCatNodes (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.pending_tasks.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html) request
    *
@@ -82,17 +67,17 @@ function buildCatPendingTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +92,8 @@ function buildCatPendingTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.plugins.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html) request
    *
@@ -82,17 +67,17 @@ function buildCatPlugins (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +92,8 @@ function buildCatPlugins (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.recovery.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html) request
    *
@@ -83,17 +68,17 @@ function buildCatRecovery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +97,8 @@ function buildCatRecovery (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.repositories.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html) request
    *
@@ -82,17 +67,17 @@ function buildCatRepositories (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +92,8 @@ function buildCatRepositories (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.segments.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html) request
    *
@@ -80,17 +65,17 @@ function buildCatSegments (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +94,8 @@ function buildCatSegments (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.shards.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html) request
    *
@@ -85,17 +70,17 @@ function buildCatShards (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +99,8 @@ function buildCatShards (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.snapshots.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html) request
    *
@@ -84,17 +69,17 @@ function buildCatSnapshots (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, repository } = params
+    var { method, body, repository, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'repository'])
+    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 +98,8 @@ function buildCatSnapshots (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.tasks.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html) request
    *
@@ -87,17 +72,17 @@ function buildCatTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +97,8 @@ function buildCatTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.templates.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html) request
    *
@@ -83,17 +68,17 @@ function buildCatTemplates (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 +97,8 @@ function buildCatTemplates (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cat.thread_pool.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html) request
    *
@@ -85,17 +70,17 @@ function buildCatThreadPool (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, threadPoolPatterns, thread_pool_patterns } = params
+    var { method, body, threadPoolPatterns, thread_pool_patterns, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'threadPoolPatterns', 'thread_pool_patterns'])
+    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 +99,8 @@ function buildCatThreadPool (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.delete_auto_follow_pattern.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrDeleteAutoFollowPattern (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.delete_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-delete-auto-follow-pattern.html) request
    *
@@ -63,17 +48,17 @@ function buildCcrDeleteAutoFollowPattern (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 = ''
@@ -88,34 +73,8 @@ function buildCcrDeleteAutoFollowPattern (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.follow.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrFollow (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-follow.html) request
    *
@@ -69,17 +54,17 @@ function buildCcrFollow (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -94,34 +79,8 @@ function buildCcrFollow (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.follow_info.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrFollowInfo (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.follow_info](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-info.html) request
    *
@@ -57,17 +42,17 @@ function buildCcrFollowInfo (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -82,34 +67,8 @@ function buildCcrFollowInfo (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.follow_stats.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrFollowStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.follow_stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-stats.html) request
    *
@@ -57,17 +42,17 @@ function buildCcrFollowStats (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -82,34 +67,8 @@ function buildCcrFollowStats (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.forget_follower.js

@@ -0,0 +1,86 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+'use strict'
+
+/* eslint camelcase: 0 */
+/* eslint no-unused-vars: 0 */
+
+function buildCcrForgetFollower (opts) {
+  // eslint-disable-next-line no-unused-vars
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
+  /**
+   * Perform a [ccr.forget_follower](http://www.elastic.co/guide/en/elasticsearch/reference/current) request
+   *
+   * @param {string} index - the name of the leader index for which specified follower retention leases should be removed
+   * @param {object} body - the name and UUID of the follower index, the name of the cluster containing the follower index, and the alias from the perspective of that cluster for the remote cluster containing the leader index
+   */
+
+  const acceptedQuerystring = [
+
+  ]
+
+  const snakeCase = {
+
+  }
+
+  return function ccrForgetFollower (params, options, callback) {
+    options = options || {}
+    if (typeof options === 'function') {
+      callback = options
+      options = {}
+    }
+    if (typeof params === 'function' || params == null) {
+      callback = params
+      params = {}
+      options = {}
+    }
+
+    // check required parameters
+    if (params['index'] == null) {
+      const err = new ConfigurationError('Missing required parameter: index')
+      return handleError(err, callback)
+    }
+    if (params['body'] == null) {
+      const err = new ConfigurationError('Missing required parameter: body')
+      return handleError(err, callback)
+    }
+
+    // validate headers object
+    if (options.headers != null && typeof options.headers !== 'object') {
+      const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
+      return handleError(err, callback)
+    }
+
+    var warnings = []
+    var { method, body, index, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
+
+    if (method == null) {
+      method = 'POST'
+    }
+
+    var ignore = options.ignore
+    if (typeof ignore === 'number') {
+      options.ignore = [ignore]
+    }
+
+    var path = ''
+
+    path = '/' + encodeURIComponent(index) + '/' + '_ccr' + '/' + 'forget_follower'
+
+    // build request object
+    const request = {
+      method,
+      path,
+      body: body || '',
+      querystring
+    }
+
+    options.warnings = warnings.length === 0 ? null : warnings
+    return makeRequest(request, options, callback)
+  }
+}
+
+module.exports = buildCcrForgetFollower

api/api/ccr.get_auto_follow_pattern.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrGetAutoFollowPattern (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.get_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-auto-follow-pattern.html) request
    *
@@ -57,17 +42,17 @@ function buildCcrGetAutoFollowPattern (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 = ''
@@ -86,34 +71,8 @@ function buildCcrGetAutoFollowPattern (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.pause_follow.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrPauseFollow (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.pause_follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-pause-follow.html) request
    *
@@ -63,17 +48,17 @@ function buildCcrPauseFollow (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -88,34 +73,8 @@ function buildCcrPauseFollow (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.put_auto_follow_pattern.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrPutAutoFollowPattern (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.put_auto_follow_pattern](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-auto-follow-pattern.html) request
    *
@@ -68,17 +53,17 @@ function buildCcrPutAutoFollowPattern (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 = ''
@@ -93,34 +78,8 @@ function buildCcrPutAutoFollowPattern (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.resume_follow.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrResumeFollow (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.resume_follow](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-resume-follow.html) request
    *
@@ -64,17 +49,17 @@ function buildCcrResumeFollow (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -89,34 +74,8 @@ function buildCcrResumeFollow (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.stats.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrStats (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-stats.html) request
    *
@@ -56,17 +41,17 @@ function buildCcrStats (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 = ''
@@ -81,34 +66,8 @@ function buildCcrStats (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ccr.unfollow.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildCcrUnfollow (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ccr.unfollow](http://www.elastic.co/guide/en/elasticsearch/reference/current) request
    *
@@ -63,17 +48,17 @@ function buildCcrUnfollow (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -88,34 +73,8 @@ function buildCcrUnfollow (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/clear_scroll.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-scroll.html) request
    *
@@ -63,17 +48,17 @@ function buildClearScroll (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, scrollId, scroll_id } = params
+    var { method, body, scrollId, scroll_id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'scrollId', 'scroll_id'])
+    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 +77,8 @@ function buildClearScroll (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.allocation_explain.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html) request
    *
@@ -68,17 +53,17 @@ function buildClusterAllocationExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +78,8 @@ function buildClusterAllocationExplain (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.get_settings.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html) request
    *
@@ -78,17 +63,17 @@ function buildClusterGetSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +88,8 @@ function buildClusterGetSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.health.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html) request
    *
@@ -95,17 +80,17 @@ function buildClusterHealth (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -124,34 +109,8 @@ function buildClusterHealth (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.pending_tasks.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html) request
    *
@@ -72,17 +57,17 @@ function buildClusterPendingTasks (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +82,8 @@ function buildClusterPendingTasks (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.put_settings.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html) request
    *
@@ -76,17 +61,17 @@ function buildClusterPutSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 = ''
@@ -101,34 +86,8 @@ function buildClusterPutSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.remote_info.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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/master/cluster-remote-info.html) request
    *
@@ -67,17 +52,17 @@ function buildClusterRemoteInfo (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +77,8 @@ function buildClusterRemoteInfo (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.reroute.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html) request
    *
@@ -77,17 +62,17 @@ function buildClusterReroute (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 +87,8 @@ function buildClusterReroute (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.state.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html) request
    *
@@ -98,17 +83,17 @@ function buildClusterState (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, metric } = params
+    var { method, body, index, metric, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'metric'])
+    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 = ''
@@ -129,34 +114,8 @@ function buildClusterState (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/cluster.stats.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html) request
    *
@@ -73,17 +58,17 @@ function buildClusterStats (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, nodeId, node_id } = params
+    var { method, body, nodeId, node_id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'nodeId', 'node_id'])
+    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 +87,8 @@ function buildClusterStats (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/count.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html) request
    *
@@ -106,17 +91,17 @@ function buildCount (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    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 +122,8 @@ function buildCount (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/create.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html) request
    *
@@ -86,6 +71,10 @@ function buildCreate (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params['body'] == null) {
       const err = new ConfigurationError('Missing required parameter: body')
       return handleError(err, callback)
@@ -97,26 +86,22 @@ function buildCreate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_create'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_create'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_create' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -126,34 +111,8 @@ function buildCreate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/delete.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html) request
    *
@@ -89,13 +74,20 @@ function buildDelete (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
     }
 
     // check required url components
-    if (params['id'] != null && (params['index'] == null)) {
+    if (params['id'] != null && (params['type'] == null || params['index'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: type, index')
+      return handleError(err, callback)
+    } else if (params['type'] != null && (params['index'] == null)) {
       const err = new ConfigurationError('Missing required parameter of the url: index')
       return handleError(err, callback)
     }
@@ -106,26 +98,22 @@ function buildDelete (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -135,34 +123,8 @@ function buildDelete (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/delete_by_query.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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/master/docs-delete-by-query.html) request
    *
@@ -86,7 +71,9 @@ function buildDeleteByQuery (opts) {
     'sort',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'terminate_after',
     'stats',
     'version',
@@ -114,7 +101,9 @@ function buildDeleteByQuery (opts) {
     searchType: 'search_type',
     searchTimeout: 'search_timeout',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     terminateAfter: 'terminate_after',
     requestCache: 'request_cache',
     waitForActiveShards: 'wait_for_active_shards',
@@ -159,17 +148,17 @@ function buildDeleteByQuery (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    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 +177,8 @@ function buildDeleteByQuery (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/delete_by_query_rethrottle.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildDeleteByQueryRethrottle (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [delete_by_query_rethrottle](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html) request
    *
@@ -79,17 +64,17 @@ function buildDeleteByQueryRethrottle (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, taskId, task_id } = params
+    var { method, body, taskId, task_id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'taskId', 'task_id'])
+    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 = ''
@@ -104,34 +89,8 @@ function buildDeleteByQueryRethrottle (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/delete_script.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html) request
    *
@@ -77,17 +62,17 @@ function buildDeleteScript (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id } = params
+    var { method, body, id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    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 +87,8 @@ function buildDeleteScript (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/exists.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
    *
@@ -53,7 +38,9 @@ function buildExists (opts) {
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -66,7 +53,9 @@ function buildExists (opts) {
   const snakeCase = {
     storedFields: 'stored_fields',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -93,6 +82,10 @@ function buildExists (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -104,26 +97,22 @@ function buildExists (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -133,34 +122,8 @@ function buildExists (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/exists_source.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,13 +9,13 @@
 
 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
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
-   * @param {string} type - The type of the document; deprecated and optional starting with 7.0
+   * @param {string} type - The type of the document; use `_all` to fetch the first document matching the ID across all types
    * @param {string} parent - The ID of the parent document
    * @param {string} preference - Specify the node or shard the operation should be performed on (default: random)
    * @param {boolean} realtime - Specify whether to perform the operation in realtime or search mode
@@ -51,7 +36,9 @@ function buildExistsSource (opts) {
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -63,7 +50,9 @@ function buildExistsSource (opts) {
 
   const snakeCase = {
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -90,6 +79,10 @@ function buildExistsSource (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -110,26 +103,22 @@ function buildExistsSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_source' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -139,34 +128,8 @@ function buildExistsSource (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/explain.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html) request
    *
@@ -60,7 +45,9 @@ function buildExplain (opts) {
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'pretty',
     'human',
     'error_trace',
@@ -73,7 +60,9 @@ function buildExplain (opts) {
     defaultOperator: 'default_operator',
     storedFields: 'stored_fields',
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -99,6 +88,10 @@ function buildExplain (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
 
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
@@ -106,26 +99,22 @@ function buildExplain (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_explain'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_explain'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_explain' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -135,34 +124,8 @@ function buildExplain (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/field_caps.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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/master/search-field-caps.html) request
    *
@@ -33,6 +18,7 @@ function buildFieldCaps (opts) {
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+   * @param {object} body - Field json objects containing an array of field names
    */
 
   const acceptedQuerystring = [
@@ -67,29 +53,23 @@ function buildFieldCaps (opts) {
       options = {}
     }
 
-    // check required parameters
-    if (params.body != null) {
-      const err = new ConfigurationError('This API does not require a body')
-      return handleError(err, callback)
-    }
-
     // validate headers object
     if (options.headers != null && typeof options.headers !== 'object') {
       const err = new ConfigurationError(`Headers should be an object, instead got: ${typeof options.headers}`)
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -104,38 +84,12 @@ function buildFieldCaps (opts) {
     const request = {
       method,
       path,
-      body: '',
+      body: body || '',
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/get.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
    *
@@ -55,8 +40,8 @@ function buildGet (opts) {
     'routing',
     '_source',
     '_source_excludes',
-    '_source_includes',
     '_source_exclude',
+    '_source_includes',
     '_source_include',
     'version',
     'version_type',
@@ -70,8 +55,8 @@ function buildGet (opts) {
   const snakeCase = {
     storedFields: 'stored_fields',
     _sourceExcludes: '_source_excludes',
-    _sourceIncludes: '_source_includes',
     _sourceExclude: '_source_exclude',
+    _sourceIncludes: '_source_includes',
     _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',
@@ -99,6 +84,10 @@ function buildGet (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -110,26 +99,22 @@ function buildGet (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -139,34 +124,8 @@ function buildGet (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/get_script.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html) request
    *
@@ -75,17 +60,17 @@ function buildGetScript (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id } = params
+    var { method, body, id, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id'])
+    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 +85,8 @@ function buildGetScript (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/get_source.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,13 +9,13 @@
 
 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](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html) request
    *
    * @param {string} id - The document ID
    * @param {string} index - The name of the index
-   * @param {string} type - The type of the document; deprecated and optional starting with 7.0
+   * @param {string} type - The type of the document; use `_all` to fetch the first document matching the ID across all types
    * @param {string} parent - The ID of the parent document
    * @param {string} preference - Specify the node or shard the operation should be performed on (default: random)
    * @param {boolean} realtime - Specify whether to perform the operation in realtime or search mode
@@ -51,7 +36,9 @@ function buildGetSource (opts) {
     'routing',
     '_source',
     '_source_excludes',
+    '_source_exclude',
     '_source_includes',
+    '_source_include',
     'version',
     'version_type',
     'pretty',
@@ -63,7 +50,9 @@ function buildGetSource (opts) {
 
   const snakeCase = {
     _sourceExcludes: '_source_excludes',
+    _sourceExclude: '_source_exclude',
     _sourceIncludes: '_source_includes',
+    _sourceInclude: '_source_include',
     versionType: 'version_type',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
@@ -90,6 +79,10 @@ function buildGetSource (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params.body != null) {
       const err = new ConfigurationError('This API does not require a body')
       return handleError(err, callback)
@@ -101,26 +94,22 @@ function buildGetSource (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
-    if ((index) != null && (type) != null && (id) != null) {
+    path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + '_source'
-    } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_source' + '/' + encodeURIComponent(id)
-    }
 
     // build request object
     const request = {
@@ -130,34 +119,8 @@ function buildGetSource (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.delete_lifecycle.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmDeleteLifecycle (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.delete_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-delete-lifecycle.html) request
    *
@@ -63,17 +48,17 @@ function buildIlmDeleteLifecycle (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, policy } = params
+    var { method, body, policy, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'policy'])
+    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 = ''
@@ -88,34 +73,8 @@ function buildIlmDeleteLifecycle (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.explain_lifecycle.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmExplainLifecycle (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.explain_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-explain-lifecycle.html) request
    *
@@ -64,17 +49,17 @@ function buildIlmExplainLifecycle (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -89,34 +74,8 @@ function buildIlmExplainLifecycle (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.get_lifecycle.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmGetLifecycle (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.get_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-lifecycle.html) request
    *
@@ -63,17 +48,17 @@ function buildIlmGetLifecycle (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, policy } = params
+    var { method, body, policy, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'policy'])
+    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 +77,8 @@ function buildIlmGetLifecycle (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.get_status.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmGetStatus (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.get_status](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-status.html) request
    *
@@ -62,17 +47,17 @@ function buildIlmGetStatus (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 = ''
@@ -87,34 +72,8 @@ function buildIlmGetStatus (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.move_to_step.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmMoveToStep (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.move_to_step](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-move-to-step.html) request
    *
@@ -58,17 +43,17 @@ function buildIlmMoveToStep (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -83,34 +68,8 @@ function buildIlmMoveToStep (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.put_lifecycle.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmPutLifecycle (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.put_lifecycle](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-put-lifecycle.html) request
    *
@@ -58,17 +43,17 @@ function buildIlmPutLifecycle (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, policy } = params
+    var { method, body, policy, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'policy'])
+    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 = ''
@@ -83,34 +68,8 @@ function buildIlmPutLifecycle (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.remove_policy.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmRemovePolicy (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.remove_policy](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-remove-policy.html) request
    *
@@ -63,17 +48,17 @@ function buildIlmRemovePolicy (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -88,34 +73,8 @@ function buildIlmRemovePolicy (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.retry.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmRetry (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.retry](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-retry-policy.html) request
    *
@@ -63,17 +48,17 @@ function buildIlmRetry (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -88,34 +73,8 @@ function buildIlmRetry (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.start.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmStart (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.start](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-start.html) request
    *
@@ -62,17 +47,17 @@ function buildIlmStart (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 = ''
@@ -87,34 +72,8 @@ function buildIlmStart (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/ilm.stop.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIlmStop (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [ilm.stop](https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-stop.html) request
    *
@@ -62,17 +47,17 @@ function buildIlmStop (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body } = params
+    var { method, body, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body'])
+    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 = ''
@@ -87,34 +72,8 @@ function buildIlmStop (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/index.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html) request
    *
@@ -91,13 +76,20 @@ function buildIndex (opts) {
       const err = new ConfigurationError('Missing required parameter: index')
       return handleError(err, callback)
     }
+    if (params['type'] == null) {
+      const err = new ConfigurationError('Missing required parameter: type')
+      return handleError(err, callback)
+    }
     if (params['body'] == null) {
       const err = new ConfigurationError('Missing required parameter: body')
       return handleError(err, callback)
     }
 
     // check required url components
-    if (params['id'] != null && (params['index'] == null)) {
+    if (params['id'] != null && (params['type'] == null || params['index'] == null)) {
+      const err = new ConfigurationError('Missing required parameter of the url: type, index')
+      return handleError(err, callback)
+    } else if (params['type'] != null && (params['index'] == null)) {
       const err = new ConfigurationError('Missing required parameter of the url: index')
       return handleError(err, callback)
     }
@@ -108,29 +100,25 @@ function buildIndex (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, id, index, type } = params
+    var { method, body, id, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'id', 'index', 'type'])
+    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 = ''
 
     if ((index) != null && (type) != null && (id) != null) {
       path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type) + '/' + encodeURIComponent(id)
-    } else if ((index) != null && (id) != null) {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc' + '/' + encodeURIComponent(id)
-    } else if ((index) != null && (type) != null) {
-      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type)
     } else {
-      path = '/' + encodeURIComponent(index) + '/' + '_doc'
+      path = '/' + encodeURIComponent(index) + '/' + encodeURIComponent(type)
     }
 
     // build request object
@@ -141,34 +129,8 @@ function buildIndex (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.analyze.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-analyze.html) request
    *
@@ -65,17 +50,17 @@ function buildIndicesAnalyze (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -94,34 +79,8 @@ function buildIndicesAnalyze (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.clear_cache.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,11 +9,12 @@
 
 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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clearcache.html) request
    *
    * @param {list} index - A comma-separated list of index name to limit the operation
+   * @param {boolean} field_data - Clear field data. This is deprecated. Prefer `fielddata`.
    * @param {boolean} fielddata - Clear field data
    * @param {list} fields - A comma-separated list of fields to clear when using the `fielddata` parameter (default: all)
    * @param {boolean} query - Clear query caches
@@ -36,10 +22,12 @@ function buildIndicesClearCache (opts) {
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
    * @param {list} index - A comma-separated list of index name to limit the operation
+   * @param {boolean} request_cache - Clear request cache
    * @param {boolean} request - Clear request cache
    */
 
   const acceptedQuerystring = [
+    'field_data',
     'fielddata',
     'fields',
     'query',
@@ -47,6 +35,7 @@ function buildIndicesClearCache (opts) {
     'allow_no_indices',
     'expand_wildcards',
     'index',
+    'request_cache',
     'request',
     'pretty',
     'human',
@@ -56,9 +45,11 @@ function buildIndicesClearCache (opts) {
   ]
 
   const snakeCase = {
+    fieldData: 'field_data',
     ignoreUnavailable: 'ignore_unavailable',
     allowNoIndices: 'allow_no_indices',
     expandWildcards: 'expand_wildcards',
+    requestCache: 'request_cache',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -87,17 +78,17 @@ function buildIndicesClearCache (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring, warnings)
 
     if (method == null) {
-      method = 'POST'
+      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 +107,8 @@ function buildIndicesClearCache (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.close.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html) request
    *
@@ -86,17 +71,17 @@ function buildIndicesClose (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +96,8 @@ function buildIndicesClose (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.create.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index.html) request
    *
@@ -33,6 +18,7 @@ function buildIndicesCreate (opts) {
    * @param {string} wait_for_active_shards - Set the number of active shards to wait for before the operation returns.
    * @param {time} timeout - Explicit operation timeout
    * @param {time} master_timeout - Specify timeout for connection to master
+   * @param {boolean} update_all_types - Whether to update the mapping for all fields with the same name across all types or not
    * @param {object} body - The configuration for the index (`settings` and `mappings`)
    */
 
@@ -41,6 +27,7 @@ function buildIndicesCreate (opts) {
     'wait_for_active_shards',
     'timeout',
     'master_timeout',
+    'update_all_types',
     'pretty',
     'human',
     'error_trace',
@@ -52,6 +39,7 @@ function buildIndicesCreate (opts) {
     includeTypeName: 'include_type_name',
     waitForActiveShards: 'wait_for_active_shards',
     masterTimeout: 'master_timeout',
+    updateAllTypes: 'update_all_types',
     errorTrace: 'error_trace',
     filterPath: 'filter_path'
   }
@@ -80,17 +68,17 @@ function buildIndicesCreate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +93,8 @@ function buildIndicesCreate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.delete.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-index.html) request
    *
@@ -86,17 +71,17 @@ function buildIndicesDelete (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -111,34 +96,8 @@ function buildIndicesDelete (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.delete_alias.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request
    *
@@ -88,17 +73,17 @@ function buildIndicesDeleteAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    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 +102,8 @@ function buildIndicesDeleteAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.delete_template.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request
    *
@@ -77,17 +62,17 @@ function buildIndicesDeleteTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 +87,8 @@ function buildIndicesDeleteTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.exists.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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/master/indices-exists.html) request
    *
@@ -89,17 +74,17 @@ function buildIndicesExists (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +99,8 @@ function buildIndicesExists (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.exists_alias.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request
    *
@@ -84,17 +69,17 @@ function buildIndicesExistsAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    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 = ''
@@ -113,34 +98,8 @@ function buildIndicesExistsAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.exists_template.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request
    *
@@ -80,17 +65,17 @@ function buildIndicesExistsTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 +90,8 @@ function buildIndicesExistsTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.exists_type.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-types-exists.html) request
    *
@@ -94,17 +79,17 @@ function buildIndicesExistsType (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    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 +104,8 @@ function buildIndicesExistsType (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.flush.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html) request
    *
@@ -82,17 +67,17 @@ function buildIndicesFlush (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +96,8 @@ function buildIndicesFlush (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.flush_synced.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-synced-flush.html) request
    *
@@ -77,17 +62,17 @@ function buildIndicesFlushSynced (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 +91,8 @@ function buildIndicesFlushSynced (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.forcemerge.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html) request
    *
@@ -85,17 +70,17 @@ function buildIndicesForcemerge (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -114,34 +99,8 @@ function buildIndicesForcemerge (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.freeze.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,7 @@
 
 function buildIndicesFreeze (opts) {
   // eslint-disable-next-line no-unused-vars
-  const { makeRequest, ConfigurationError, handleError } = opts
+  const { makeRequest, ConfigurationError, handleError, snakeCaseKeys } = opts
   /**
    * Perform a [indices.freeze](https://www.elastic.co/guide/en/elasticsearch/reference/current/frozen.html) request
    *
@@ -82,17 +67,17 @@ function buildIndicesFreeze (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -107,34 +92,8 @@ function buildIndicesFreeze (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.get.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,12 +9,12 @@
 
 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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-index.html) request
    *
    * @param {list} index - A comma-separated list of index names
-   * @param {boolean} include_type_name - Whether to add the type name to the response (default: false)
+   * @param {boolean} include_type_name - Whether to add the type name to the response (default: true)
    * @param {boolean} local - Return local information, do not retrieve the state from master node (default: false)
    * @param {boolean} ignore_unavailable - Ignore unavailable indexes (default: false)
    * @param {boolean} allow_no_indices - Ignore if a wildcard expression resolves to no concrete indices (default: false)
@@ -95,17 +80,17 @@ function buildIndicesGet (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index } = params
+    var { method, body, index, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index'])
+    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 = ''
@@ -120,34 +105,8 @@ function buildIndicesGet (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.get_alias.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html) request
    *
@@ -80,17 +65,17 @@ function buildIndicesGetAlias (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    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 +98,8 @@ function buildIndicesGetAlias (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.get_field_mapping.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html) request
    *
@@ -91,17 +76,17 @@ function buildIndicesGetFieldMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type, fields } = params
+    var { method, body, index, type, fields, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type', 'fields'])
+    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 = ''
@@ -124,34 +109,8 @@ function buildIndicesGetFieldMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.get_mapping.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,13 +9,13 @@
 
 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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html) request
    *
    * @param {list} index - A comma-separated list of index names
    * @param {list} type - A comma-separated list of document types
-   * @param {boolean} include_type_name - Whether to add the type name to the response (default: false)
+   * @param {boolean} include_type_name - Whether to add the type name to the response.
    * @param {boolean} ignore_unavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
    * @param {boolean} allow_no_indices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
    * @param {enum} expand_wildcards - Whether to expand wildcard expression to concrete indices that are open, closed or both.
@@ -86,17 +71,17 @@ function buildIndicesGetMapping (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, type } = params
+    var { method, body, index, type, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'type'])
+    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 +104,8 @@ function buildIndicesGetMapping (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.get_settings.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-settings.html) request
    *
@@ -89,17 +74,17 @@ function buildIndicesGetSettings (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, index, name } = params
+    var { method, body, index, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'index', 'name'])
+    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 = ''
@@ -122,34 +107,8 @@ function buildIndicesGetSettings (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }
 

api/api/indices.get_template.js

@@ -1,21 +1,6 @@
-/*
+// Licensed to Elasticsearch B.V under one or more agreements.
- * Licensed to Elasticsearch B.V. under one or more contributor
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
- * license agreements. See the NOTICE file distributed with
+// See the LICENSE file in the project root for more information
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
 'use strict'
 
@@ -24,7 +9,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](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html) request
    *
@@ -79,17 +64,17 @@ function buildIndicesGetTemplate (opts) {
       return handleError(err, callback)
     }
 
-    var warnings = null
+    var warnings = []
-    var { method, body, name } = params
+    var { method, body, name, ...querystring } = params
-    var querystring = semicopy(params, ['method', 'body', 'name'])
+    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 = ''
@@ -108,34 +93,8 @@ function buildIndicesGetTemplate (opts) {
       querystring
     }
 
-    const requestOptions = {
+    options.warnings = warnings.length === 0 ? null : warnings
-      ignore,
+    return makeRequest(request, options, callback)
-      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
-    }
   }
 }