Skip to content

Commit 6cd995a

Browse files
gmarzgmarz
committed
Merge branch 'develop' into feature/get-repository
Conflicts: src/Nest/IElasticClient.cs src/Nest/Nest.csproj src/Tests/Nest.Tests.Integration/IntegrationSetup.cs
2 parents 2710869 + cc7405b commit 6cd995a

35 files changed

+940
-66
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3708,12 +3708,12 @@ public PutWarmerRequestParameters ExpandWildcards(ExpandWildcards expand_wildcar
37083708
///http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-recovery.html
37093709
///</pre>
37103710
///</summary>
3711-
public class IndicesRecoveryRequestParameters : FluentRequestParameters<IndicesRecoveryRequestParameters>
3711+
public class RecoveryStatusRequestParameters : FluentRequestParameters<RecoveryStatusRequestParameters>
37123712
{
37133713

37143714
internal bool _detailed { get; set; }
37153715
///<summary>Whether to display detailed information about shard recovery</summary>
3716-
public IndicesRecoveryRequestParameters Detailed(bool detailed)
3716+
public RecoveryStatusRequestParameters Detailed(bool detailed)
37173717
{
37183718
this._detailed = detailed;
37193719
this.AddQueryString("detailed", this._detailed);
@@ -3723,7 +3723,7 @@ public IndicesRecoveryRequestParameters Detailed(bool detailed)
37233723

37243724
internal bool _active_only { get; set; }
37253725
///<summary>Display only those recoveries that are currently on-going</summary>
3726-
public IndicesRecoveryRequestParameters ActiveOnly(bool active_only)
3726+
public RecoveryStatusRequestParameters ActiveOnly(bool active_only)
37273727
{
37283728
this._active_only = active_only;
37293729
this.AddQueryString("active_only", this._active_only);
@@ -3733,7 +3733,7 @@ public IndicesRecoveryRequestParameters ActiveOnly(bool active_only)
37333733

37343734
internal bool _human { get; set; }
37353735
///<summary>Whether to return time and byte values in human-readable format.</summary>
3736-
public IndicesRecoveryRequestParameters Human(bool human)
3736+
public RecoveryStatusRequestParameters Human(bool human)
37373737
{
37383738
this._human = human;
37393739
this.AddQueryString("human", this._human);

‎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\IndicesRecoveryStatus.cs" />
7071
<Compile Include="Obsolete\IndicesTemplateExists.cs" />
7172
<Compile Include="Obsolete\IndicesGetFieldMapping.cs" />
7273
<Compile Include="Obsolete\Mpercolate.cs" />

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20319,14 +20319,14 @@ public Task<ElasticsearchResponse<DynamicDictionary>> IndicesPutWarmerPostAsync(
2031920319
///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
2032020320
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
2032120321
///</returns>
20322-
public ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20322+
public ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2032320323
{
2032420324
var url = "_recovery";
2032520325
IRequestParameters requestParams = null;
2032620326

2032720327
if (requestParameters != null)
2032820328
{
20329-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20329+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2033020330
}
2033120331

2033220332

@@ -20351,14 +20351,14 @@ public ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<IndicesRecoveryReq
2035120351
///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
2035220352
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
2035320353
///</returns>
20354-
public Task<ElasticsearchResponse<T>> IndicesRecoveryForAllAsync<T>(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20354+
public Task<ElasticsearchResponse<T>> IndicesRecoveryForAllAsync<T>(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2035520355
{
2035620356
var url = "_recovery";
2035720357
IRequestParameters requestParams = null;
2035820358

2035920359
if (requestParameters != null)
2036020360
{
20361-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20361+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2036220362
}
2036320363

2036420364

@@ -20385,14 +20385,14 @@ public Task<ElasticsearchResponse<T>> IndicesRecoveryForAllAsync<T>(Func<Indices
2038520385
///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
2038620386
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
2038720387
///</returns>
20388-
public ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20388+
public ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2038920389
{
2039020390
var url = "_recovery";
2039120391
IRequestParameters requestParams = null;
2039220392

2039320393
if (requestParameters != null)
2039420394
{
20395-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20395+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2039620396
}
2039720397

2039820398

@@ -20419,14 +20419,14 @@ public ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(Func<Indic
2041920419
///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
2042020420
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
2042120421
///</returns>
20422-
public Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryForAllAsync(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20422+
public Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryForAllAsync(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2042320423
{
2042420424
var url = "_recovery";
2042520425
IRequestParameters requestParams = null;
2042620426

2042720427
if (requestParameters != null)
2042820428
{
20429-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20429+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2043020430
}
2043120431

2043220432

@@ -20452,15 +20452,15 @@ public Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryForAllAsync
2045220452
///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
2045320453
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
2045420454
///</returns>
20455-
public ElasticsearchResponse<T> IndicesRecovery<T>(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20455+
public ElasticsearchResponse<T> IndicesRecovery<T>(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2045620456
{
2045720457
index.ThrowIfNullOrEmpty("index");
2045820458
var url = "{0}/_recovery".F(Encoded(index));
2045920459
IRequestParameters requestParams = null;
2046020460

2046120461
if (requestParameters != null)
2046220462
{
20463-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20463+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2046420464
}
2046520465

2046620466

@@ -20486,15 +20486,15 @@ public ElasticsearchResponse<T> IndicesRecovery<T>(string index, Func<IndicesRec
2048620486
///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
2048720487
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
2048820488
///</returns>
20489-
public Task<ElasticsearchResponse<T>> IndicesRecoveryAsync<T>(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20489+
public Task<ElasticsearchResponse<T>> IndicesRecoveryAsync<T>(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2049020490
{
2049120491
index.ThrowIfNullOrEmpty("index");
2049220492
var url = "{0}/_recovery".F(Encoded(index));
2049320493
IRequestParameters requestParams = null;
2049420494

2049520495
if (requestParameters != null)
2049620496
{
20497-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20497+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2049820498
}
2049920499

2050020500

@@ -20522,15 +20522,15 @@ public Task<ElasticsearchResponse<T>> IndicesRecoveryAsync<T>(string index, Func
2052220522
///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
2052320523
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
2052420524
///</returns>
20525-
public ElasticsearchResponse<DynamicDictionary> IndicesRecovery(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20525+
public ElasticsearchResponse<DynamicDictionary> IndicesRecovery(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2052620526
{
2052720527
index.ThrowIfNullOrEmpty("index");
2052820528
var url = "{0}/_recovery".F(Encoded(index));
2052920529
IRequestParameters requestParams = null;
2053020530

2053120531
if (requestParameters != null)
2053220532
{
20533-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20533+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2053420534
}
2053520535

2053620536

@@ -20558,15 +20558,15 @@ public ElasticsearchResponse<DynamicDictionary> IndicesRecovery(string index, Fu
2055820558
///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
2055920559
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
2056020560
///</returns>
20561-
public Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryAsync(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
20561+
public Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryAsync(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
2056220562
{
2056320563
index.ThrowIfNullOrEmpty("index");
2056420564
var url = "{0}/_recovery".F(Encoded(index));
2056520565
IRequestParameters requestParams = null;
2056620566

2056720567
if (requestParameters != null)
2056820568
{
20569-
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
20569+
requestParams = requestParameters(new RecoveryStatusRequestParameters());
2057020570
}
2057120571

2057220572

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10763,7 +10763,7 @@ public interface IElasticsearchClient
1076310763
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
1076410764
///</returns>
1076510765

10766-
ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10766+
ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1076710767

1076810768
///<summary>Represents a GET on /_recovery
1076910769
///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -10780,7 +10780,7 @@ public interface IElasticsearchClient
1078010780
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
1078110781
///</returns>
1078210782

10783-
Task<ElasticsearchResponse<T>> IndicesRecoveryForAllAsync<T>(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10783+
Task<ElasticsearchResponse<T>> IndicesRecoveryForAllAsync<T>(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1078410784

1078510785
///<summary>Represents a GET on /_recovery
1078610786
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -10799,7 +10799,7 @@ public interface IElasticsearchClient
1079910799
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
1080010800
///</returns>
1080110801

10802-
ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10802+
ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1080310803

1080410804
///<summary>Represents a GET on /_recovery
1080510805
///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -10818,7 +10818,7 @@ public interface IElasticsearchClient
1081810818
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
1081910819
///</returns>
1082010820

10821-
Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryForAllAsync(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10821+
Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryForAllAsync(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1082210822

1082310823
///<summary>Represents a GET on /{index}/_recovery
1082410824
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -10836,7 +10836,7 @@ public interface IElasticsearchClient
1083610836
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
1083710837
///</returns>
1083810838

10839-
ElasticsearchResponse<T> IndicesRecovery<T>(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10839+
ElasticsearchResponse<T> IndicesRecovery<T>(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1084010840

1084110841
///<summary>Represents a GET on /{index}/_recovery
1084210842
///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -10854,7 +10854,7 @@ public interface IElasticsearchClient
1085410854
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
1085510855
///</returns>
1085610856

10857-
Task<ElasticsearchResponse<T>> IndicesRecoveryAsync<T>(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10857+
Task<ElasticsearchResponse<T>> IndicesRecoveryAsync<T>(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1085810858

1085910859
///<summary>Represents a GET on /{index}/_recovery
1086010860
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -10874,7 +10874,7 @@ public interface IElasticsearchClient
1087410874
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
1087510875
///</returns>
1087610876

10877-
ElasticsearchResponse<DynamicDictionary> IndicesRecovery(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10877+
ElasticsearchResponse<DynamicDictionary> IndicesRecovery(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1087810878

1087910879
///<summary>Represents a GET on /{index}/_recovery
1088010880
///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -10894,7 +10894,7 @@ public interface IElasticsearchClient
1089410894
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
1089510895
///</returns>
1089610896

10897-
Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryAsync(string index, Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
10897+
Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryAsync(string index, Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);
1089810898

1089910899
///<summary>Represents a POST on /_refresh
1090010900
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
using System;
2+
using System.Threading.Tasks;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
7+
namespace Elasticsearch.Net
8+
{
9+
#pragma warning disable 0618
10+
using IndicesRecoveryStatusSelector = Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters>;
11+
#pragma warning restore 0618
12+
13+
[Obsolete("Scheduled to be removed in 2.0, renamed to TypeExistsRequestParameters")]
14+
public class IndicesRecoveryRequestParameters : RecoveryStatusRequestParameters { }
15+
16+
public static class IndicesRecoveryStatusClientExtensions
17+
{
18+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
19+
public static ElasticsearchResponse<T> IndicesRecoveryForAll<T>(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
20+
{
21+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
22+
return client.IndicesRecoveryForAll<T>(selector);
23+
}
24+
25+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
26+
public static Task<ElasticsearchResponse<T>> IndicesRecoveryForAllAsync<T>(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
27+
{
28+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
29+
return client.IndicesRecoveryForAllAsync<T>(selector);
30+
31+
}
32+
33+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
34+
public static ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
35+
{
36+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
37+
return client.IndicesRecoveryForAll(selector);
38+
39+
}
40+
41+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
42+
public static Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryForAllAsync(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
43+
{
44+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
45+
return client.IndicesRecoveryForAllAsync(selector);
46+
}
47+
48+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
49+
public static ElasticsearchResponse<T> IndicesRecovery<T>(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
50+
{
51+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
52+
return client.IndicesRecovery<T>(index, selector);
53+
}
54+
55+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
56+
public static Task<ElasticsearchResponse<T>> IndicesRecoveryAsync<T>(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
57+
{
58+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
59+
return client.IndicesRecoveryAsync<T>(index, selector);
60+
}
61+
62+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
63+
public static ElasticsearchResponse<DynamicDictionary> IndicesRecovery(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
64+
{
65+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
66+
return client.IndicesRecovery(index, selector);
67+
}
68+
69+
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
70+
public static Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryAsync(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
71+
{
72+
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
73+
return client.IndicesRecoveryAsync(index, selector);
74+
}
75+
}
76+
}

0 commit comments

Comments
 (0)