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

Author: Mpdreamz

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

@@ -13,4 +13,7 @@
     <PackageReference Include="CsQuery" Version="1.3.4" />
     <PackageReference Include="ShellProgressBar" Version="3.0.0" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="RestSpecification\XPack\Info" />
+  </ItemGroup>
 </Project>

src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs

@@ -6678,32 +6678,32 @@ public class GraphExploreRequestParameters : FluentRequestParameters<GraphExplor
 	///Retrieve information about xpack, including build number/timestamp and license status
 	///</pre>
 	///</summary>
-	public class XpackInfoRequestParameters : FluentRequestParameters<XpackInfoRequestParameters> 
+	public class XPackInfoRequestParameters : FluentRequestParameters<XPackInfoRequestParameters> 
 	{
 		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
 
 		///<summary>Presents additional info for humans (feature descriptions and X-Pack tagline)</summary>
-		public XpackInfoRequestParameters Human(bool human) => this.AddQueryString("human", human);
+		public XPackInfoRequestParameters Human(bool human) => this.AddQueryString("human", human);
 
 
 		///<summary>Comma-separated list of info categories. Can be any of: build, license, features</summary>
-		public XpackInfoRequestParameters Categories(params string[] categories) => this.AddQueryString("categories", categories);
+		public XPackInfoRequestParameters Categories(params string[] categories) => this.AddQueryString("categories", categories);
 
 
 		///<summary>Pretty format the returned JSON response.</summary>
-		public XpackInfoRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
+		public XPackInfoRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
 
 
 		///<summary>Include the stack trace of returned errors.</summary>
-		public XpackInfoRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
+		public XPackInfoRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
 
 
 		///<summary>The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.</summary>
-		public XpackInfoRequestParameters Source(string source) => this.AddQueryString("source", source);
+		public XPackInfoRequestParameters Source(string source) => this.AddQueryString("source", source);
 
 
 		///<summary>A comma-separated list of filters used to reduce the respone.</summary>
-		public XpackInfoRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
+		public XPackInfoRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
 
 	}
 
@@ -6712,32 +6712,32 @@ public class XpackInfoRequestParameters : FluentRequestParameters<XpackInfoReque
 	///Retrieve information about xpack features usage
 	///</pre>
 	///</summary>
-	public class XpackUsageRequestParameters : FluentRequestParameters<XpackUsageRequestParameters> 
+	public class XPackUsageRequestParameters : FluentRequestParameters<XPackUsageRequestParameters> 
 	{
 		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
 
 		///<summary>Specify timeout for watch write operation</summary>
-		public XpackUsageRequestParameters MasterTimeout(TimeSpan master_timeout) => this.AddQueryString("master_timeout", master_timeout.ToTimeUnit());
+		public XPackUsageRequestParameters MasterTimeout(TimeSpan master_timeout) => this.AddQueryString("master_timeout", master_timeout.ToTimeUnit());
 
 
 		///<summary>Pretty format the returned JSON response.</summary>
-		public XpackUsageRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
+		public XPackUsageRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
 
 
 		///<summary>Return human readable values for statistics.</summary>
-		public XpackUsageRequestParameters Human(bool human) => this.AddQueryString("human", human);
+		public XPackUsageRequestParameters Human(bool human) => this.AddQueryString("human", human);
 
 
 		///<summary>Include the stack trace of returned errors.</summary>
-		public XpackUsageRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
+		public XPackUsageRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
 
 
 		///<summary>The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.</summary>
-		public XpackUsageRequestParameters Source(string source) => this.AddQueryString("source", source);
+		public XPackUsageRequestParameters Source(string source) => this.AddQueryString("source", source);
 
 
 		///<summary>A comma-separated list of filters used to reduce the respone.</summary>
-		public XpackUsageRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
+		public XPackUsageRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
 
 	}
 

src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs

@@ -8671,7 +8671,7 @@ public ElasticsearchResponse<T> XpackGraphExplore<T>(string index, string type,
 	    ///<para>See also: Retrieve information about xpack, including build number/timestamp and license status </para>
 	    ///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public ElasticsearchResponse<T> XpackInfo<T>(Func<XpackInfoRequestParameters, XpackInfoRequestParameters> requestParameters = null)
+		public ElasticsearchResponse<T> XpackInfo<T>(Func<XPackInfoRequestParameters, XPackInfoRequestParameters> requestParameters = null)
 			where T : class => this.DoRequest<T>(GET, Url($"_xpack"), null, _params(requestParameters));
 
 		///<summary>Represents a GET on /_xpack
@@ -8684,7 +8684,7 @@ public ElasticsearchResponse<T> XpackInfo<T>(Func<XpackInfoRequestParameters, Xp
 	    ///<para>See also: Retrieve information about xpack, including build number/timestamp and license status </para>
 	    ///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<ElasticsearchResponse<T>> XpackInfoAsync<T>(Func<XpackInfoRequestParameters, XpackInfoRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<ElasticsearchResponse<T>> XpackInfoAsync<T>(Func<XPackInfoRequestParameters, XPackInfoRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class => this.DoRequestAsync<T>(GET, Url($"_xpack"), cancellationToken, null, _params(requestParameters));
 
 		///<summary>Represents a GET on /_xpack/usage
@@ -8697,7 +8697,7 @@ public ElasticsearchResponse<T> XpackInfo<T>(Func<XpackInfoRequestParameters, Xp
 	    ///<para>See also: Retrieve information about xpack features usage </para>
 	    ///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public ElasticsearchResponse<T> XpackUsage<T>(Func<XpackUsageRequestParameters, XpackUsageRequestParameters> requestParameters = null)
+		public ElasticsearchResponse<T> XpackUsage<T>(Func<XPackUsageRequestParameters, XPackUsageRequestParameters> requestParameters = null)
 			where T : class => this.DoRequest<T>(GET, Url($"_xpack/usage"), null, _params(requestParameters));
 
 		///<summary>Represents a GET on /_xpack/usage
@@ -8710,7 +8710,7 @@ public ElasticsearchResponse<T> XpackUsage<T>(Func<XpackUsageRequestParameters,
 	    ///<para>See also: Retrieve information about xpack features usage </para>
 	    ///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<ElasticsearchResponse<T>> XpackUsageAsync<T>(Func<XpackUsageRequestParameters, XpackUsageRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<ElasticsearchResponse<T>> XpackUsageAsync<T>(Func<XPackUsageRequestParameters, XPackUsageRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class => this.DoRequestAsync<T>(GET, Url($"_xpack/usage"), cancellationToken, null, _params(requestParameters));
 
 		///<summary>Represents a DELETE on /_xpack/license

src/Elasticsearch.Net/IElasticLowLevelClient.Generated.cs

@@ -8073,7 +8073,7 @@ public partial interface IElasticLowLevelClient
 		///<para>See also: Retrieve information about xpack, including build number/timestamp and license status </para>
 		///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		ElasticsearchResponse<T> XpackInfo<T>(Func<XpackInfoRequestParameters, XpackInfoRequestParameters> requestParameters = null) where T : class;
+		ElasticsearchResponse<T> XpackInfo<T>(Func<XPackInfoRequestParameters, XPackInfoRequestParameters> requestParameters = null) where T : class;
 
 		///<summary>Represents a GET on /_xpack
 		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
@@ -8085,7 +8085,7 @@ public partial interface IElasticLowLevelClient
 		///<para>See also: Retrieve information about xpack, including build number/timestamp and license status </para>
 		///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		Task<ElasticsearchResponse<T>> XpackInfoAsync<T>(Func<XpackInfoRequestParameters, XpackInfoRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		Task<ElasticsearchResponse<T>> XpackInfoAsync<T>(Func<XPackInfoRequestParameters, XPackInfoRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
 
 		///<summary>Represents a GET on /_xpack/usage
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
@@ -8097,7 +8097,7 @@ public partial interface IElasticLowLevelClient
 		///<para>See also: Retrieve information about xpack features usage </para>
 		///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		ElasticsearchResponse<T> XpackUsage<T>(Func<XpackUsageRequestParameters, XpackUsageRequestParameters> requestParameters = null) where T : class;
+		ElasticsearchResponse<T> XpackUsage<T>(Func<XPackUsageRequestParameters, XPackUsageRequestParameters> requestParameters = null) where T : class;
 
 		///<summary>Represents a GET on /_xpack/usage
 		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
@@ -8109,7 +8109,7 @@ public partial interface IElasticLowLevelClient
 		///<para>See also: Retrieve information about xpack features usage </para>
 		///</summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		Task<ElasticsearchResponse<T>> XpackUsageAsync<T>(Func<XpackUsageRequestParameters, XpackUsageRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		Task<ElasticsearchResponse<T>> XpackUsageAsync<T>(Func<XPackUsageRequestParameters, XPackUsageRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
 
 		///<summary>Represents a DELETE on /_xpack/license
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:

src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs

@@ -54,6 +54,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				case "unique": return o.ToObject<UniqueTokenFilter>(ElasticContractResolver.Empty);
 				case "uppercase": return o.ToObject<UppercaseTokenFilter>(ElasticContractResolver.Empty);
 				case "word_delimiter": return o.ToObject<WordDelimiterTokenFilter>(ElasticContractResolver.Empty);
+				case "word_delimiter_graph": return o.ToObject<WordDelimiterGraphTokenFilter>(ElasticContractResolver.Empty);
 				case "fingerprint": return o.ToObject<FingerprintTokenFilter>(ElasticContractResolver.Empty);
 				case "kuromoji_readingform": return o.ToObject<KuromojiReadingFormTokenFilter>(ElasticContractResolver.Empty);
 				case "kuromoji_part_of_speech": return o.ToObject<KuromojiPartOfSpeechTokenFilter>(ElasticContractResolver.Empty);

src/Nest/Analysis/TokenFilters/TokenFilters.cs

@@ -95,6 +95,13 @@ public TokenFiltersDescriptor SynonymGraph(string name, Func<SynonymGraphTokenFi
 		public TokenFiltersDescriptor WordDelimiter(string name, Func<WordDelimiterTokenFilterDescriptor, IWordDelimiterTokenFilter> selector) =>
 			Assign(name, selector?.Invoke(new WordDelimiterTokenFilterDescriptor()));
 
+		/// <summary>
+		/// A token filter of type asciifolding that converts alphabetic, numeric, and symbolic Unicode characters which are
+		/// <para> not in the first 127 ASCII characters (the “Basic Latin” Unicode block) into their ASCII equivalents, if one exists.</para>
+		/// </summary>
+		public TokenFiltersDescriptor WordDelimiterGraph(string name, Func<WordDelimiterGraphTokenFilterDescriptor, IWordDelimiterGraphTokenFilter> selector) =>
+			Assign(name, selector?.Invoke(new WordDelimiterGraphTokenFilterDescriptor()));
+
 		/// <summary>
 		/// A token filter of type asciifolding that converts alphabetic, numeric, and symbolic Unicode characters which are
 		/// <para> not in the first 127 ASCII characters (the “Basic Latin” Unicode block) into their ASCII equivalents, if one exists.</para>