Skip to content

Feature/recovery status #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 2, 2014
Merged

Feature/recovery status #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6adf01
implemented indices recovery API, still need to work on bwc
Mpdreamz Sep 1, 2014
cb73fdd
added bwc for IndicesRecovery()
Mpdreamz Sep 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3708,12 +3708,12 @@ public PutWarmerRequestParameters ExpandWildcards(ExpandWildcards expand_wildcar
///http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-recovery.html
///</pre>
///</summary>
public class IndicesRecoveryRequestParameters : FluentRequestParameters<IndicesRecoveryRequestParameters>
public class RecoveryStatusRequestParameters : FluentRequestParameters<RecoveryStatusRequestParameters>
{

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

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

internal bool _human { get; set; }
///<summary>Whether to return time and byte values in human-readable format.</summary>
public IndicesRecoveryRequestParameters Human(bool human)
public RecoveryStatusRequestParameters Human(bool human)
{
this._human = human;
this.AddQueryString("human", this._human);
Expand Down
1 change: 1 addition & 0 deletions src/Elasticsearch.Net/Elasticsearch.Net.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<Compile Include="Domain\Response\VoidResponse.cs" />
<Compile Include="Domain\Response\ElasticsearchServerError.cs" />
<Compile Include="Exceptions\OneToOneServerException.cs" />
<Compile Include="Obsolete\IndicesRecoveryStatus.cs" />
<Compile Include="Obsolete\IndicesTemplateExists.cs" />
<Compile Include="Obsolete\IndicesGetFieldMapping.cs" />
<Compile Include="Obsolete\Mpercolate.cs" />
Expand Down
32 changes: 16 additions & 16 deletions src/Elasticsearch.Net/ElasticsearchClient.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20319,14 +20319,14 @@ public Task<ElasticsearchResponse<DynamicDictionary>> IndicesPutWarmerPostAsync(
///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
///</returns>
public ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null)
public ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null)
{
var url = "_recovery";
IRequestParameters requestParams = null;

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


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

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


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

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


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

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


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

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


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

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


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

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


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

if (requestParameters != null)
{
requestParams = requestParameters(new IndicesRecoveryRequestParameters());
requestParams = requestParameters(new RecoveryStatusRequestParameters());
}


Expand Down
16 changes: 8 additions & 8 deletions src/Elasticsearch.Net/IElasticsearchClient.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10763,7 +10763,7 @@ public interface IElasticsearchClient
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
///</returns>

ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
ElasticsearchResponse<T> IndicesRecoveryForAll<T>(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);

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

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

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

ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters> requestParameters = null);
ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(Func<RecoveryStatusRequestParameters, RecoveryStatusRequestParameters> requestParameters = null);

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

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

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

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

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

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

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

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

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

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

///<summary>Represents a POST on /_refresh
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
Expand Down
76 changes: 76 additions & 0 deletions src/Elasticsearch.Net/Obsolete/IndicesRecoveryStatus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
using System;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace Elasticsearch.Net
{
#pragma warning disable 0618
using IndicesRecoveryStatusSelector = Func<IndicesRecoveryRequestParameters, IndicesRecoveryRequestParameters>;
#pragma warning restore 0618

[Obsolete("Scheduled to be removed in 2.0, renamed to TypeExistsRequestParameters")]
public class IndicesRecoveryRequestParameters : RecoveryStatusRequestParameters { }

public static class IndicesRecoveryStatusClientExtensions
{
[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static ElasticsearchResponse<T> IndicesRecoveryForAll<T>(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecoveryForAll<T>(selector);
}

[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static Task<ElasticsearchResponse<T>> IndicesRecoveryForAllAsync<T>(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecoveryForAllAsync<T>(selector);

}

[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static ElasticsearchResponse<DynamicDictionary> IndicesRecoveryForAll(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecoveryForAll(selector);

}

[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryForAllAsync(this IElasticsearchClient client, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecoveryForAllAsync(selector);
}

[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static ElasticsearchResponse<T> IndicesRecovery<T>(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecovery<T>(index, selector);
}

[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static Task<ElasticsearchResponse<T>> IndicesRecoveryAsync<T>(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecoveryAsync<T>(index, selector);
}

[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static ElasticsearchResponse<DynamicDictionary> IndicesRecovery(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecovery(index, selector);
}

[Obsolete("Scheduled to be removed in 2.0, use the method that takes a Func of RecoveryStatusRequestParameters")]
public static Task<ElasticsearchResponse<DynamicDictionary>> IndicesRecoveryAsync(this IElasticsearchClient client, string index, IndicesRecoveryStatusSelector requestParameters = null)
{
var selector = Obsolete.UpCastSelector<IndicesRecoveryRequestParameters, RecoveryStatusRequestParameters>(requestParameters);
return client.IndicesRecoveryAsync(index, selector);
}
}
}
Loading