Merge branch '6.x' of github.com:elastic/elasticsearch-net into 6.x

Author: russcam

src/CodeGeneration/ApiGenerator/RestSpecification/XPack/MachineLearning/xpack.ml.close_job.replace.json

@@ -0,0 +1,33 @@
+{
+  "xpack.ml.close_job": {
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html",
+    "methods": [ "POST" ],
+    "url": {
+      "path": "/_xpack/ml/anomaly_detectors/{job_id}/_close",
+      "paths": [ "/_xpack/ml/anomaly_detectors/{job_id}/_close" ],
+      "parts": {
+        "job_id": {
+          "type": "string",
+          "required": true,
+          "description": "The name of the job to close"
+        }
+      },
+      "params": {
+        "allow_no_jobs": {
+          "type": "boolean",
+          "required": false,
+          "description": "Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)"
+        },
+        "force": {
+          "type": "boolean",
+          "required": false,
+          "description": "True if the job should be forcefully closed"
+        },
+        "timeout": {
+          "type": "time",
+          "description": "Controls the time to wait until a job has closed. Default to 30 minutes"
+        }
+      }
+    }
+  }
+}

src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs

@@ -3306,16 +3306,14 @@ public TResponse XpackLicensePostStartTrial<TResponse>(StartTrialLicenseRequestP
 			where TResponse : class, IElasticsearchResponse, new() => this.DoRequestAsync<TResponse>(POST, Url($"_xpack/license/start_trial"), ctx, null, _params(requestParameters));
 		///<summary>POST on /_xpack/ml/anomaly_detectors/{job_id}/_close <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html</para></summary>
 		///<param name="job_id">The name of the job to close</param>
-		///<param name="body">The URL params optionally sent in the body</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public TResponse XpackMlCloseJob<TResponse>(string job_id, PostData body, CloseJobRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() => this.DoRequest<TResponse>(POST, Url($"_xpack/ml/anomaly_detectors/{job_id.NotNull("job_id")}/_close"), body, _params(requestParameters));
+		public TResponse XpackMlCloseJob<TResponse>(string job_id, CloseJobRequestParameters requestParameters = null)
+			where TResponse : class, IElasticsearchResponse, new() => this.DoRequest<TResponse>(POST, Url($"_xpack/ml/anomaly_detectors/{job_id.NotNull("job_id")}/_close"), null, _params(requestParameters));
 		///<summary>POST on /_xpack/ml/anomaly_detectors/{job_id}/_close <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html</para></summary>
 		///<param name="job_id">The name of the job to close</param>
-		///<param name="body">The URL params optionally sent in the body</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<TResponse> XpackMlCloseJobAsync<TResponse>(string job_id, PostData body, CloseJobRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken))
-			where TResponse : class, IElasticsearchResponse, new() => this.DoRequestAsync<TResponse>(POST, Url($"_xpack/ml/anomaly_detectors/{job_id.NotNull("job_id")}/_close"), ctx, body, _params(requestParameters));
+		public Task<TResponse> XpackMlCloseJobAsync<TResponse>(string job_id, CloseJobRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken))
+			where TResponse : class, IElasticsearchResponse, new() => this.DoRequestAsync<TResponse>(POST, Url($"_xpack/ml/anomaly_detectors/{job_id.NotNull("job_id")}/_close"), ctx, null, _params(requestParameters));
 		///<summary>DELETE on /_xpack/ml/calendars/{calendar_id} <para></para></summary>
 		///<param name="calendar_id">The ID of the calendar to delete</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>

src/Elasticsearch.Net/IElasticLowLevelClient.Generated.cs

@@ -2676,14 +2676,12 @@ public partial interface IElasticLowLevelClient
 		Task<TResponse> XpackLicensePostStartTrialAsync<TResponse>(StartTrialLicenseRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
 		///<summary>POST on /_xpack/ml/anomaly_detectors/{job_id}/_close <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html</para></summary>
 		///<param name="job_id">The name of the job to close</param>
-		///<param name="body">The URL params optionally sent in the body</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		TResponse XpackMlCloseJob<TResponse>(string job_id, PostData body, CloseJobRequestParameters requestParameters = null) where TResponse : class, IElasticsearchResponse, new();
+		TResponse XpackMlCloseJob<TResponse>(string job_id, CloseJobRequestParameters requestParameters = null) where TResponse : class, IElasticsearchResponse, new();
 		///<summary>POST on /_xpack/ml/anomaly_detectors/{job_id}/_close <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html</para></summary>
 		///<param name="job_id">The name of the job to close</param>
-		///<param name="body">The URL params optionally sent in the body</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		Task<TResponse> XpackMlCloseJobAsync<TResponse>(string job_id, PostData body, CloseJobRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
+		Task<TResponse> XpackMlCloseJobAsync<TResponse>(string job_id, CloseJobRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
 		///<summary>DELETE on /_xpack/ml/calendars/{calendar_id} <para></para></summary>
 		///<param name="calendar_id">The ID of the calendar to delete</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>

src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs

@@ -101,6 +101,10 @@ public PutMappingRequest() : this(typeof(T), typeof(T)) { }
 	[DescriptorFor("IndicesPutMapping")]
 	public partial class PutMappingDescriptor<T> where T : class
 	{
+		/// <summary>/{index}/{type}/_mapping. Will infer the index from the generic type</summary>
+		///<param name="type"> this parameter is required</param>
+		public PutMappingDescriptor(TypeName type) : base(r=>r.Required("type", type).Required("index", (IndexName)typeof(T))){}
+
 		public PutMappingDescriptor(IndexName index, TypeName type) : base(r => r.Required("index", index).Required("type", type)) { }
 
 		IAllField ITypeMapping.AllField { get; set; }

src/Nest/XPack/MachineLearning/CloseJob/ElasticClient-CloseJob.cs

@@ -35,7 +35,7 @@ public ICloseJobResponse CloseJob(Id jobId, Func<CloseJobDescriptor, ICloseJobRe
 		public ICloseJobResponse CloseJob(ICloseJobRequest request) =>
 			Dispatcher.Dispatch<ICloseJobRequest, CloseJobRequestParameters, CloseJobResponse>(
 				request,
-				(p, d) => LowLevelDispatch.XpackMlCloseJobDispatch<CloseJobResponse>(p, d)
+				(p, d) => LowLevelDispatch.XpackMlCloseJobDispatch<CloseJobResponse>(p)
 			);
 
 		/// <inheritdoc />
@@ -49,7 +49,7 @@ public Task<ICloseJobResponse> CloseJobAsync(Id jobId, Func<CloseJobDescriptor,
 			Dispatcher.DispatchAsync<ICloseJobRequest, CloseJobRequestParameters, CloseJobResponse, ICloseJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => LowLevelDispatch.XpackMlCloseJobDispatchAsync<CloseJobResponse>(p, d, c)
+				(p, d, c) => LowLevelDispatch.XpackMlCloseJobDispatchAsync<CloseJobResponse>(p, c)
 			);
 	}
 }

src/Nest/XPack/Security/User/DisableUser/DisableUserRequest.cs

@@ -1,9 +1,19 @@
-namespace Nest
+using System;
+
+namespace Nest
 {
 	public partial interface IDisableUserRequest { }
 
 	public partial class DisableUserRequest { }
 
 	[DescriptorFor("XpackSecurityDisableUser")]
-	public partial class DisableUserDescriptor { }
+	public partial class DisableUserDescriptor
+	{
+		[Obsolete("Use the constructor that accepts Name. Will be removed in the next major release")]
+		public DisableUserDescriptor() { }
+
+		[Obsolete("Use the constructor that accepts Name. Will be removed in the next major release")]
+		public DisableUserDescriptor Username(Name username) =>
+			Assign(username, (a , v) => a.RouteValues.Required("username", username));
+	}
 }

src/Nest/XPack/Security/User/EnableUser/EnableUserRequest.cs

@@ -1,9 +1,19 @@
-namespace Nest
+using System;
+
+namespace Nest
 {
 	public partial interface IEnableUserRequest { }
 
 	public partial class EnableUserRequest { }
 
 	[DescriptorFor("XpackSecurityEnableUser")]
-	public partial class EnableUserDescriptor { }
+	public partial class EnableUserDescriptor
+	{
+		[Obsolete("Use the constructor that accepts Name. Will be removed in the next major release")]
+		public EnableUserDescriptor() { }
+
+		[Obsolete("Use the constructor that accepts Name. Will be removed in the next major release")]
+		public EnableUserDescriptor Username(Name username) =>
+			Assign(username, (a , v) => a.RouteValues.Required("username", username));
+	}
 }

src/Nest/_Generated/_LowLevelDispatch.generated.cs

@@ -3594,23 +3594,23 @@ internal partial class LowLevelDispatch
 			throw InvalidDispatch("XpackLicensePostStartTrial", p, new [] { POST }, "/_xpack/license/start_trial");
 		}
 
-		internal TResponse XpackMlCloseJobDispatch<TResponse>(IRequest<CloseJobRequestParameters> p,SerializableData<ICloseJobRequest> body) where TResponse : class, IElasticsearchResponse, new()
+		internal TResponse XpackMlCloseJobDispatch<TResponse>(IRequest<CloseJobRequestParameters> p) where TResponse : class, IElasticsearchResponse, new()
 		{
 			switch(p.HttpMethod)
 			{
 				case POST:
-					if (AllSetNoFallback(p.RouteValues.JobId)) return _lowLevel.XpackMlCloseJob<TResponse>(p.RouteValues.JobId,body,p.RequestParameters);
+					if (AllSetNoFallback(p.RouteValues.JobId)) return _lowLevel.XpackMlCloseJob<TResponse>(p.RouteValues.JobId,p.RequestParameters);
 					break;
 			}
 			throw InvalidDispatch("XpackMlCloseJob", p, new [] { POST }, "/_xpack/ml/anomaly_detectors/{job_id}/_close");
 		}
 
-		internal Task<TResponse> XpackMlCloseJobDispatchAsync<TResponse>(IRequest<CloseJobRequestParameters> p,SerializableData<ICloseJobRequest> body, CancellationToken ct) where TResponse : class, IElasticsearchResponse, new()
+		internal Task<TResponse> XpackMlCloseJobDispatchAsync<TResponse>(IRequest<CloseJobRequestParameters> p, CancellationToken ct) where TResponse : class, IElasticsearchResponse, new()
 		{
 			switch(p.HttpMethod)
 			{
 				case POST:
-					if (AllSetNoFallback(p.RouteValues.JobId)) return _lowLevel.XpackMlCloseJobAsync<TResponse>(p.RouteValues.JobId,body,p.RequestParameters,ct);
+					if (AllSetNoFallback(p.RouteValues.JobId)) return _lowLevel.XpackMlCloseJobAsync<TResponse>(p.RouteValues.JobId,p.RequestParameters,ct);
 					break;
 			}
 			throw InvalidDispatch("XpackMlCloseJob", p, new [] { POST }, "/_xpack/ml/anomaly_detectors/{job_id}/_close");