Skip to content

Commit 3ae1715

Browse files
gmarzgmarz
committed
Merge branch 'develop' of https://github.com/elasticsearch/elasticsearch-net into develop
2 parents df21777 + 43642ac commit 3ae1715

35 files changed

+1255
-95
lines changed

‎src/Elasticsearch.Net/Domain/Enums.Generated.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
///This file contains all the typed enums that the client rest api spec exposes.
99
///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
10-
///Generated of commit 154a5112f9
10+
///Generated of commit
1111
namespace Elasticsearch.Net
1212
{
1313

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
//This file contains all the typed querystring parameters that are generated of the client spec.
99
//This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
10-
//Generated of commit 154a5112f9
10+
//Generated of commit
1111

1212
namespace Elasticsearch.Net
1313
{
@@ -3048,12 +3048,12 @@ public GetAliasesRequestParameters Local(bool local)
30483048
///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-get-field-mapping.html
30493049
///</pre>
30503050
///</summary>
3051-
public class IndicesGetFieldMappingRequestParameters : FluentRequestParameters<IndicesGetFieldMappingRequestParameters>
3051+
public class GetFieldMappingRequestParameters : FluentRequestParameters<GetFieldMappingRequestParameters>
30523052
{
30533053

30543054
internal bool _include_defaults { get; set; }
30553055
///<summary>Whether the default mapping values should be returned as well</summary>
3056-
public IndicesGetFieldMappingRequestParameters IncludeDefaults(bool include_defaults)
3056+
public GetFieldMappingRequestParameters IncludeDefaults(bool include_defaults)
30573057
{
30583058
this._include_defaults = include_defaults;
30593059
this.AddQueryString("include_defaults", this._include_defaults);
@@ -3063,7 +3063,7 @@ public IndicesGetFieldMappingRequestParameters IncludeDefaults(bool include_defa
30633063

30643064
internal bool _ignore_unavailable { get; set; }
30653065
///<summary>Whether specified concrete indices should be ignored when unavailable (missing or closed)</summary>
3066-
public IndicesGetFieldMappingRequestParameters IgnoreUnavailable(bool ignore_unavailable)
3066+
public GetFieldMappingRequestParameters IgnoreUnavailable(bool ignore_unavailable)
30673067
{
30683068
this._ignore_unavailable = ignore_unavailable;
30693069
this.AddQueryString("ignore_unavailable", this._ignore_unavailable);
@@ -3073,7 +3073,7 @@ public IndicesGetFieldMappingRequestParameters IgnoreUnavailable(bool ignore_una
30733073

30743074
internal bool _allow_no_indices { get; set; }
30753075
///<summary>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</summary>
3076-
public IndicesGetFieldMappingRequestParameters AllowNoIndices(bool allow_no_indices)
3076+
public GetFieldMappingRequestParameters AllowNoIndices(bool allow_no_indices)
30773077
{
30783078
this._allow_no_indices = allow_no_indices;
30793079
this.AddQueryString("allow_no_indices", this._allow_no_indices);
@@ -3083,7 +3083,7 @@ public IndicesGetFieldMappingRequestParameters AllowNoIndices(bool allow_no_indi
30833083

30843084
internal ExpandWildcards _expand_wildcards { get; set; }
30853085
///<summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
3086-
public IndicesGetFieldMappingRequestParameters ExpandWildcards(ExpandWildcards expand_wildcards)
3086+
public GetFieldMappingRequestParameters ExpandWildcards(ExpandWildcards expand_wildcards)
30873087
{
30883088
this._expand_wildcards = expand_wildcards;
30893089
this.AddQueryString("expand_wildcards", this._expand_wildcards);
@@ -3093,7 +3093,7 @@ public IndicesGetFieldMappingRequestParameters ExpandWildcards(ExpandWildcards e
30933093

30943094
internal bool _local { get; set; }
30953095
///<summary>Return local information, do not retrieve the state from master node (default: false)</summary>
3096-
public IndicesGetFieldMappingRequestParameters Local(bool local)
3096+
public GetFieldMappingRequestParameters Local(bool local)
30973097
{
30983098
this._local = local;
30993099
this.AddQueryString("local", this._local);

‎src/Elasticsearch.Net/Elasticsearch.Net.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<Compile Include="Domain\Response\VoidResponse.cs" />
6868
<Compile Include="Domain\Response\ElasticsearchServerError.cs" />
6969
<Compile Include="Exceptions\OneToOneServerException.cs" />
70+
<Compile Include="Obsolete\IndicesGetFieldMapping.cs" />
7071
<Compile Include="Obsolete\Mpercolate.cs" />
7172
<Compile Include="Obsolete\IndicesExistsType.cs" />
7273
<Compile Include="Obsolete\Obsolete.cs" />

‎src/Elasticsearch.Net/ElasticsearchClient.Generated.cs

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

‎src/Elasticsearch.Net/IElasticsearchClient.Generated.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Elasticsearch.Net
1515
///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
1616
///</pre>
1717
///<pre>
18-
///Generated of commit 154a5112f9
18+
///Generated of commit
1919
///</pre>
2020
///</summary>
2121
public interface IElasticsearchClient
@@ -7452,7 +7452,7 @@ public interface IElasticsearchClient
74527452
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
74537453
///</returns>
74547454

7455-
ElasticsearchResponse<T> IndicesGetFieldMappingForAll<T>(string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7455+
ElasticsearchResponse<T> IndicesGetFieldMappingForAll<T>(string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
74567456

74577457
///<summary>Represents a GET on /_mapping/field/{field}
74587458
///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -7470,7 +7470,7 @@ public interface IElasticsearchClient
74707470
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
74717471
///</returns>
74727472

7473-
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingForAllAsync<T>(string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7473+
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingForAllAsync<T>(string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
74747474

74757475
///<summary>Represents a GET on /_mapping/field/{field}
74767476
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -7490,7 +7490,7 @@ public interface IElasticsearchClient
74907490
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
74917491
///</returns>
74927492

7493-
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMappingForAll(string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7493+
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMappingForAll(string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
74947494

74957495
///<summary>Represents a GET on /_mapping/field/{field}
74967496
///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -7510,7 +7510,7 @@ public interface IElasticsearchClient
75107510
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
75117511
///</returns>
75127512

7513-
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingForAllAsync(string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7513+
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingForAllAsync(string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
75147514

75157515
///<summary>Represents a GET on /{index}/_mapping/field/{field}
75167516
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -7529,7 +7529,7 @@ public interface IElasticsearchClient
75297529
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
75307530
///</returns>
75317531

7532-
ElasticsearchResponse<T> IndicesGetFieldMapping<T>(string index, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7532+
ElasticsearchResponse<T> IndicesGetFieldMapping<T>(string index, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
75337533

75347534
///<summary>Represents a GET on /{index}/_mapping/field/{field}
75357535
///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -7548,7 +7548,7 @@ public interface IElasticsearchClient
75487548
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
75497549
///</returns>
75507550

7551-
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingAsync<T>(string index, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7551+
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingAsync<T>(string index, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
75527552

75537553
///<summary>Represents a GET on /{index}/_mapping/field/{field}
75547554
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -7569,7 +7569,7 @@ public interface IElasticsearchClient
75697569
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
75707570
///</returns>
75717571

7572-
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMapping(string index, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7572+
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMapping(string index, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
75737573

75747574
///<summary>Represents a GET on /{index}/_mapping/field/{field}
75757575
///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -7590,7 +7590,7 @@ public interface IElasticsearchClient
75907590
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
75917591
///</returns>
75927592

7593-
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingAsync(string index, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7593+
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingAsync(string index, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
75947594

75957595
///<summary>Represents a GET on /_mapping/{type}/field/{field}
75967596
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -7609,7 +7609,7 @@ public interface IElasticsearchClient
76097609
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
76107610
///</returns>
76117611

7612-
ElasticsearchResponse<T> IndicesGetFieldMappingForAll<T>(string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7612+
ElasticsearchResponse<T> IndicesGetFieldMappingForAll<T>(string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
76137613

76147614
///<summary>Represents a GET on /_mapping/{type}/field/{field}
76157615
///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -7628,7 +7628,7 @@ public interface IElasticsearchClient
76287628
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
76297629
///</returns>
76307630

7631-
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingForAllAsync<T>(string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7631+
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingForAllAsync<T>(string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
76327632

76337633
///<summary>Represents a GET on /_mapping/{type}/field/{field}
76347634
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -7649,7 +7649,7 @@ public interface IElasticsearchClient
76497649
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
76507650
///</returns>
76517651

7652-
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMappingForAll(string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7652+
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMappingForAll(string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
76537653

76547654
///<summary>Represents a GET on /_mapping/{type}/field/{field}
76557655
///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -7670,7 +7670,7 @@ public interface IElasticsearchClient
76707670
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
76717671
///</returns>
76727672

7673-
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingForAllAsync(string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7673+
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingForAllAsync(string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
76747674

76757675
///<summary>Represents a GET on /{index}/_mapping/{type}/field/{field}
76767676
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -7690,7 +7690,7 @@ public interface IElasticsearchClient
76907690
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
76917691
///</returns>
76927692

7693-
ElasticsearchResponse<T> IndicesGetFieldMapping<T>(string index, string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7693+
ElasticsearchResponse<T> IndicesGetFieldMapping<T>(string index, string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
76947694

76957695
///<summary>Represents a GET on /{index}/_mapping/{type}/field/{field}
76967696
///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -7710,7 +7710,7 @@ public interface IElasticsearchClient
77107710
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
77117711
///</returns>
77127712

7713-
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingAsync<T>(string index, string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7713+
Task<ElasticsearchResponse<T>> IndicesGetFieldMappingAsync<T>(string index, string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
77147714

77157715
///<summary>Represents a GET on /{index}/_mapping/{type}/field/{field}
77167716
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -7732,7 +7732,7 @@ public interface IElasticsearchClient
77327732
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
77337733
///</returns>
77347734

7735-
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMapping(string index, string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7735+
ElasticsearchResponse<DynamicDictionary> IndicesGetFieldMapping(string index, string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
77367736

77377737
///<summary>Represents a GET on /{index}/_mapping/{type}/field/{field}
77387738
///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -7754,7 +7754,7 @@ public interface IElasticsearchClient
77547754
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
77557755
///</returns>
77567756

7757-
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingAsync(string index, string type, string field, Func<IndicesGetFieldMappingRequestParameters, IndicesGetFieldMappingRequestParameters> requestParameters = null);
7757+
Task<ElasticsearchResponse<DynamicDictionary>> IndicesGetFieldMappingAsync(string index, string type, string field, Func<GetFieldMappingRequestParameters, GetFieldMappingRequestParameters> requestParameters = null);
77587758

77597759
///<summary>Represents a GET on /_mapping
77607760
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.

‎src/Elasticsearch.Net/Obsolete/IndicesExistsAlias.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Elasticsearch.Net
1313
[Obsolete("Scheduled to be removed in 2.0, renamed to AliasExistsRequestParameters")]
1414
public class IndicesExistsAliasRequestParameters : AliasExistsRequestParameters { }
1515

16-
public static class IndicesExistsAliasClientExtensions
16+
public static class IndicesGetFieldMappingClientExtensions
1717
{
1818
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of AliasExistsRequestParameters")]
1919
public static ElasticsearchResponse<T> IndicesExistsAlias<T>(

0 commit comments

Comments
 (0)