Merge branch '2.x' into feature/2.x-reindex-rethrottle

# Conflicts:
#	src/Elasticsearch.Net/Domain/Enums.Generated.cs
#	src/Nest/_Generated/_Descriptors.generated.cs
#	src/Nest/_Generated/_Requests.generated.cs

Author: russcam

src/CodeGeneration/ApiGenerator/Domain/CsharpMethod.cs

@@ -191,7 +191,17 @@ public IEnumerable<Constructor> DescriptorConstructors()
 				{
 					doc += "\r\n" + string.Join("\t\t\r\n", cp.Select(p => $"///<param name=\"{p.Key}\"> this parameter is required</param>"));
 				}
-				var c = new Constructor { Generated = $"public {m}({par}) : base({routing}){{}}", Description = doc };
+
+				var generated = $"public {m}({par}) : base({routing}){{}}";
+
+				// Add typeof(T) as the default type when only index specified
+				if ((m == "UpdateByQueryDescriptor") && cp.Count() == 1 && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+				{
+					var generic = this.RequestTypeGeneric.Replace("<", "").Replace(">", "");
+					generated = $"public {m}({par}) : base({routing}.Required(\"type\", (Types)typeof({generic}))){{}}";
+				}
+
+				var c = new Constructor { Generated = generated, Description = doc };
 				ctors.Add(c);
 			}
 			if (IsDocumentPath && !string.IsNullOrEmpty(this.DescriptorTypeGeneric))

src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html

@@ -9,15 +9,15 @@
 
 
     <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/frameworks-b54806b006ba52935377cfa698af8bb2200dd03318001e967d986314f4c11d29.css" media="all" rel="stylesheet" />
-    <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/github-7779b57edafe155a3aa1b637cecde8ee61b92710fda0c54fdffc9826639a0bdd.css" media="all" rel="stylesheet" />
+    <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/github-8b2474817eaa20276db40d0e1b2273134aab8755285e953f318eae52da59a971.css" media="all" rel="stylesheet" />
 
 
     <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/site-f6ce114ac3bc145f575863b4a6dbdf65e924bccb184fc4d4a4f5a09819b4173d.css" media="all" rel="stylesheet" />
 
 
-    <link as="script" href="https://assets-cdn.github.com/assets/frameworks-779e3c6faa0d0139afab0793984d0529dd910e1645b109e2e6a281ae6a97ad7a.js" rel="preload" />
+    <link as="script" href="https://assets-cdn.github.com/assets/frameworks-2c76cc192ef357ffd1604a67307c1426cfd7513a720b1a87d1f53eb24a928308.js" rel="preload" />
 
-    <link as="script" href="https://assets-cdn.github.com/assets/github-610f0ec6bfdb0c7e0930c7f65c6a5216107e3d66611e9bca8d69f06dde94283b.js" rel="preload" />
+    <link as="script" href="https://assets-cdn.github.com/assets/github-5124bc733834808e4d93c497e1e824659031c173802edc0ebeaa873f26290e00.js" rel="preload" />
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv="Content-Language" content="en">
@@ -46,7 +46,7 @@
 
     <meta name="pjax-timeout" content="1000">
 
-    <meta name="request-id" content="3CF105D8:248E:80B3EF6:57E345BF" data-pjax-transient>
+    <meta name="request-id" content="3CF105D8:248E:94DEBA8:57E48228" data-pjax-transient>
 
     <meta name="msapplication-TileImage" content="/windows-tile.png">
     <meta name="msapplication-TileColor" content="#ffffff">
@@ -56,7 +56,7 @@
 <meta name="google-site-verification" content="ZzhVyEFwb7w3e0-uOTltm8Jsck2F5StVihD0exw2fsA">
     <meta name="google-analytics" content="UA-3769691-2">
 
-<meta content="collector.githubapp.com" name="octolytics-host" /><meta content="github" name="octolytics-app-id" /><meta content="3CF105D8:248E:80B3EF6:57E345BF" name="octolytics-dimension-request_id" />
+<meta content="collector.githubapp.com" name="octolytics-host" /><meta content="github" name="octolytics-app-id" /><meta content="3CF105D8:248E:94DEBA8:57E48228" name="octolytics-dimension-request_id" />
 <meta content="/&lt;user-name&gt;/&lt;repo-name&gt;/files/disambiguate" data-pjax-transient="true" name="analytics-location" />
 
 
@@ -69,16 +69,16 @@
     <meta name="user-login" content="">
 
         <meta name="expected-hostname" content="github.com">
-      <meta name="js-proxy-site-detection-payload" content="YmYwZTI4OTFjOTVkMDI0ZDQwNGI0OTJiODBjNzcyYzg5ZjMzYmI4Y2E3NmM4Nzg0YzI4YWYzNjJjNzI2MDJkMnx7InJlbW90ZV9hZGRyZXNzIjoiNjAuMjQxLjUuMjE2IiwicmVxdWVzdF9pZCI6IjNDRjEwNUQ4OjI0OEU6ODBCM0VGNjo1N0UzNDVCRiIsInRpbWVzdGFtcCI6MTQ3NDUxMjMyMH0=">
+      <meta name="js-proxy-site-detection-payload" content="OGU3OTY0YjI4ZmY2M2Q4MjlkZGNjODdiMDgzYWQ3ZDQwZGMyMjY1NDkwOTdiZjViMjJlODFiMzgzNGM4NTM3OHx7InJlbW90ZV9hZGRyZXNzIjoiNjAuMjQxLjUuMjE2IiwicmVxdWVzdF9pZCI6IjNDRjEwNUQ4OjI0OEU6OTRERUJBODo1N0U0ODIyOCIsInRpbWVzdGFtcCI6MTQ3NDU5MzMyMH0=">
 
 
       <link rel="mask-icon" href="https://assets-cdn.github.com/pinned-octocat.svg" color="#4078c0">
       <link rel="icon" type="image/x-icon" href="https://assets-cdn.github.com/favicon.ico">
 
-    <meta name="html-safe-nonce" content="d64929332fb9fdf01f471c869248d025df93e6ac">
-    <meta content="c4a1c1984d0b3a502bb18d4a6fdd4666eedeba4d" name="form-nonce" />
+    <meta name="html-safe-nonce" content="8f2234e4d7a52c9094fb896655cbde482970c5a8">
+    <meta content="4976261c6b5696b032bf1f84c0266a7b4d8795e3" name="form-nonce" />
 
-    <meta http-equiv="x-pjax-version" content="799233884d6b105cb0d71874f12b85fe">
+    <meta http-equiv="x-pjax-version" content="887caaf9b12cc4c32735762b46c900fe">
 
 
 
@@ -183,8 +183,8 @@
     Watch
   </a>
   <a class="social-count" href="/elastic/elasticsearch/watchers"
-     aria-label="1743 users are watching this repository">
-    1,743
+     aria-label="1747 users are watching this repository">
+    1,747
   </a>
 
   </li>
@@ -198,8 +198,8 @@
   </a>
 
     <a class="social-count js-social-count" href="/elastic/elasticsearch/stargazers"
-      aria-label="18489 users starred this repository">
-      18,489
+      aria-label="18504 users starred this repository">
+      18,504
     </a>
 
   </li>
@@ -213,8 +213,8 @@
       </a>
 
     <a href="/elastic/elasticsearch/network" class="social-count"
-       aria-label="6291 users are forked this repository">
-      6,291
+       aria-label="6297 users are forked this repository">
+      6,297
     </a>
   </li>
 </ul>
@@ -247,15 +247,15 @@ <h1 class="public ">
       <a href="/elastic/elasticsearch/issues" class="js-selected-navigation-item reponav-item" data-hotkey="g i" data-selected-links="repo_issues repo_labels repo_milestones /elastic/elasticsearch/issues" itemprop="url">
         <svg aria-hidden="true" class="octicon octicon-issue-opened" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"></path></svg>
         <span itemprop="name">Issues</span>
-        <span class="counter">1,039</span>
+        <span class="counter">1,041</span>
         <meta itemprop="position" content="2">
 </a>    </span>
 
   <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement">
     <a href="/elastic/elasticsearch/pulls" class="js-selected-navigation-item reponav-item" data-hotkey="g p" data-selected-links="repo_pulls /elastic/elasticsearch/pulls" itemprop="url">
       <svg aria-hidden="true" class="octicon octicon-git-pull-request" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg>
       <span itemprop="name">Pull requests</span>
-      <span class="counter">79</span>
+      <span class="counter">80</span>
       <meta itemprop="position" content="3">
 </a>  </span>
 
@@ -815,6 +815,16 @@ <h1 class="public ">
                 russcam-patch-2
               </span>
             </a>
+            <a class="select-menu-item js-navigation-item js-navigation-open "
+               href="/elastic/elasticsearch/tree/russcam-patch-2.4.0-reindex-rethrottle/plugins/delete-by-query/src/test/resources/rest-api-spec/api"
+               data-name="russcam-patch-2.4.0-reindex-rethrottle"
+               data-skip-pjax="true"
+               rel="nofollow">
+              <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z"></path></svg>
+              <span class="select-menu-item-text css-truncate-target js-select-menu-filter-text">
+                russcam-patch-2.4.0-reindex-rethrottle
+              </span>
+            </a>
             <a class="select-menu-item js-navigation-item js-navigation-open "
                href="/elastic/elasticsearch/tree/russcam-patch-3/plugins/delete-by-query/src/test/resources/rest-api-spec/api"
                data-name="russcam-patch-3"
@@ -1984,7 +1994,7 @@ <h1 class="public ">
       <svg aria-hidden="true" class="octicon octicon-mark-github" height="24" version="1.1" viewBox="0 0 16 16" width="24"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
 </a>
     <ul class="site-footer-links">
-      <li>&copy; 2016 <span title="0.05026s from github-fe134-cp1-prd.iad.github.net">GitHub</span>, Inc.</li>
+      <li>&copy; 2016 <span title="0.07898s from github-fe-bc3c088.cp1-iad.github.net">GitHub</span>, Inc.</li>
         <li><a href="https://github.com/site/terms" data-ga-click="Footer, go to terms, text:terms">Terms</a></li>
         <li><a href="https://github.com/site/privacy" data-ga-click="Footer, go to privacy, text:privacy">Privacy</a></li>
         <li><a href="https://github.com/security" data-ga-click="Footer, go to security, text:security">Security</a></li>
@@ -2008,8 +2018,8 @@ <h1 class="public ">
 
 
       <script crossorigin="anonymous" src="https://assets-cdn.github.com/assets/compat-40e365359d1c4db1e36a55be458e60f2b7c24d58b5a00ae13398480e7ba768e0.js"></script>
-      <script crossorigin="anonymous" src="https://assets-cdn.github.com/assets/frameworks-779e3c6faa0d0139afab0793984d0529dd910e1645b109e2e6a281ae6a97ad7a.js"></script>
-      <script async="async" crossorigin="anonymous" src="https://assets-cdn.github.com/assets/github-610f0ec6bfdb0c7e0930c7f65c6a5216107e3d66611e9bca8d69f06dde94283b.js"></script>
+      <script crossorigin="anonymous" src="https://assets-cdn.github.com/assets/frameworks-2c76cc192ef357ffd1604a67307c1426cfd7513a720b1a87d1f53eb24a928308.js"></script>
+      <script async="async" crossorigin="anonymous" src="https://assets-cdn.github.com/assets/github-5124bc733834808e4d93c497e1e824659031c173802edc0ebeaa873f26290e00.js"></script>
 
 
 

src/CodeGeneration/ApiGenerator/RestSpecification/DeleteByQuery/root.html

@@ -7,22 +7,30 @@ namespace Nest
 	public partial interface IElasticClient
 	{
 		/// <summary>
-		/// The delete by query API allows to delete documents from one or more indices and one or more types based on a query.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete-by-query.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete-by-query.html</a>
+		/// The update by query API allows to update documents from one or more indices and one or more types based on a query.
+		/// <para> </para><a href="https://www.elastic.co/guide/en/elasticsearch/reference/2.4/docs-update-by-query.html">https://www.elastic.co/guide/en/elasticsearch/reference/2.4/docs-update-by-query.html</a>
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename as well as describe the strongly
 		///  typed parts of the query</typeparam>
-		/// <param name="selector">An optional descriptor to further describe the delete by query operation</param>
+		/// <param name="selector">An optional descriptor to further describe the update by query operation</param>
 		IUpdateByQueryResponse UpdateByQuery<T>(Indices indices, Types types, Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector)
 			where T : class;
 
+		/// <inheritdoc/>
+		IUpdateByQueryResponse UpdateByQuery<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector)
+			where T : class;
+
 		/// <inheritdoc/>
 		IUpdateByQueryResponse UpdateByQuery(IUpdateByQueryRequest request);
 
 		/// <inheritdoc/>
 		Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Indices indices, Types types, Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector)
 			where T : class;
 
+		/// <inheritdoc/>
+		Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector)
+			where T : class;
+
 		/// <inheritdoc/>
 		Task<IUpdateByQueryResponse> UpdateByQueryAsync(IUpdateByQueryRequest request);
 
@@ -34,6 +42,10 @@ public partial class ElasticClient
 		public IUpdateByQueryResponse UpdateByQuery<T>(Indices indices, Types types, Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector) where T : class =>
 			this.UpdateByQuery(selector?.Invoke(new UpdateByQueryDescriptor<T>(indices).Type(types)));
 
+		/// <inheritdoc/>
+		public IUpdateByQueryResponse UpdateByQuery<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector) where T : class =>
+			this.UpdateByQuery(selector?.Invoke(new UpdateByQueryDescriptor<T>(typeof(T))));
+
 		/// <inheritdoc/>
 		public IUpdateByQueryResponse UpdateByQuery(IUpdateByQueryRequest request) =>
 			this.Dispatcher.Dispatch<IUpdateByQueryRequest, UpdateByQueryRequestParameters, UpdateByQueryResponse>(
@@ -45,6 +57,10 @@ public IUpdateByQueryResponse UpdateByQuery(IUpdateByQueryRequest request) =>
 		public Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Indices indices, Types types, Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector) where T : class =>
 			this.UpdateByQueryAsync(selector?.Invoke(new UpdateByQueryDescriptor<T>(indices).Type(types)));
 
+		/// <inheritdoc/>
+		public Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector) where T : class =>
+			this.UpdateByQueryAsync(selector?.Invoke(new UpdateByQueryDescriptor<T>(typeof(T))));
+
 		/// <inheritdoc/>
 		public Task<IUpdateByQueryResponse> UpdateByQueryAsync(IUpdateByQueryRequest request) =>
 			this.Dispatcher.DispatchAsync<IUpdateByQueryRequest, UpdateByQueryRequestParameters, UpdateByQueryResponse, IUpdateByQueryResponse>(

src/Nest/Document/Multiple/UpdateByQuery/ElasticClient-UpdateByQuery.cs

@@ -36,7 +36,6 @@ public IGetAliasesResponse GetAlias(Func<GetAliasDescriptor, IGetAliasRequest> s
 		public IGetAliasesResponse GetAlias(IGetAliasRequest request) =>
 			this.Dispatcher.Dispatch<IGetAliasRequest, GetAliasRequestParameters, GetAliasesResponse>(
 				request,
-				DeserializeGetAliasesResponse,
 				(p, d) => this.LowLevelDispatch.IndicesGetAliasDispatch<GetAliasesResponse>(p)
 			);
 
@@ -48,7 +47,6 @@ public Task<IGetAliasesResponse> GetAliasAsync(Func<GetAliasDescriptor, IGetAlia
 		public Task<IGetAliasesResponse> GetAliasAsync(IGetAliasRequest request) =>
 			this.Dispatcher.DispatchAsync<IGetAliasRequest, GetAliasRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
 				request,
-				DeserializeGetAliasesResponse,
 				(p, d) => this.LowLevelDispatch.IndicesGetAliasDispatchAsync<GetAliasesResponse>(p)
 			);
 	}