Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@

namespace Elasticsearch.Net
{
//TODO document and possibly rename some of the properties

// TODO: Make this class internal in 2.0
public static class ElasticsearchResponse
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a todo to make this whole class internal in 2.0

{
public static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse from, TTo to)
internal static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse from, TTo to)
{
var response = new ElasticsearchResponse<TTo>(from.Settings)
{
Expand All @@ -46,7 +45,6 @@ public static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse f
}
}


public class ElasticsearchResponse<T> : IElasticsearchResponse
{
private static readonly string _printFormat;
Expand Down
13 changes: 8 additions & 5 deletions src/Nest/Domain/ICustomJson.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

namespace Nest
{
//If an object implements this then it can handle its own json representation
/// <summary>
/// If an object implements this then it can handle its own json representation
/// </summary>
public interface ICustomJson
{
object GetCustomJson();
}

public interface IDomainObject
{

}
/// <summary>
/// Any object that implements this interface will automatically have all
/// JsonProperties of all of its implementing interfaces discovered.
/// </summary>
public interface INestSerializable { }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets make this a proper <summary>: Any object that implements this interface will automatically have all the JsonProperties of all its implementing interfaces discovered.

}
8 changes: 4 additions & 4 deletions src/Nest/ElasticClient-AliasExists.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public partial class ElasticClient
/// <inheritdoc />
public IExistsResponse AliasExists(Func<AliasExistsDescriptor, AliasExistsDescriptor> selector)
{
return this.Dispatch<AliasExistsDescriptor, AliasExistsRequestParameters, ExistsResponse>(
return this.Dispatcher.Dispatch<AliasExistsDescriptor, AliasExistsRequestParameters, ExistsResponse>(
selector,
(p, d) => this.RawDispatch.IndicesExistsAliasDispatch<ExistsResponse>(
p.DeserializationState(new AliasExistConverter(DeserializeExistsResponse))
Expand All @@ -25,7 +25,7 @@ public IExistsResponse AliasExists(Func<AliasExistsDescriptor, AliasExistsDescri
/// <inheritdoc />
public IExistsResponse AliasExists(IAliasExistsRequest AliasRequest)
{
return this.Dispatch<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse>(
return this.Dispatcher.Dispatch<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse>(
AliasRequest,
(p, d) => this.RawDispatch.IndicesExistsAliasDispatch<ExistsResponse>(
p.DeserializationState(new AliasExistConverter(DeserializeExistsResponse))
Expand All @@ -36,7 +36,7 @@ public IExistsResponse AliasExists(IAliasExistsRequest AliasRequest)
/// <inheritdoc />
public Task<IExistsResponse> AliasExistsAsync(Func<AliasExistsDescriptor, AliasExistsDescriptor> selector)
{
return this.DispatchAsync<AliasExistsDescriptor, AliasExistsRequestParameters, ExistsResponse, IExistsResponse>(
return this.Dispatcher.DispatchAsync<AliasExistsDescriptor, AliasExistsRequestParameters, ExistsResponse, IExistsResponse>(
selector,
(p, d) => this.RawDispatch.IndicesExistsAliasDispatchAsync<ExistsResponse>(
p.DeserializationState(new AliasExistConverter(DeserializeExistsResponse))
Expand All @@ -47,7 +47,7 @@ public Task<IExistsResponse> AliasExistsAsync(Func<AliasExistsDescriptor, AliasE
/// <inheritdoc />
public Task<IExistsResponse> AliasExistsAsync(IAliasExistsRequest AliasRequest)
{
return this.DispatchAsync<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse, IExistsResponse>(
return this.Dispatcher.DispatchAsync<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse, IExistsResponse>(
AliasRequest,
(p, d) => this.RawDispatch.IndicesExistsAliasDispatchAsync<ExistsResponse>(
p.DeserializationState(new AliasExistConverter(DeserializeExistsResponse))
Expand Down
40 changes: 20 additions & 20 deletions src/Nest/ElasticClient-Aliases.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public partial class ElasticClient
/// <inheritdoc />
public IIndicesOperationResponse Alias(IAliasRequest aliasRequest)
{
return this.Dispatch<IAliasRequest, AliasRequestParameters, IndicesOperationResponse>(
return this.Dispatcher.Dispatch<IAliasRequest, AliasRequestParameters, IndicesOperationResponse>(
aliasRequest,
(p, d) => this.RawDispatch.IndicesUpdateAliasesDispatch<IndicesOperationResponse>(p, d)
);
Expand All @@ -24,7 +24,7 @@ public IIndicesOperationResponse Alias(IAliasRequest aliasRequest)
/// <inheritdoc />
public IIndicesOperationResponse Alias(Func<AliasDescriptor, AliasDescriptor> aliasSelector)
{
return this.Dispatch<AliasDescriptor, AliasRequestParameters, IndicesOperationResponse>(
return this.Dispatcher.Dispatch<AliasDescriptor, AliasRequestParameters, IndicesOperationResponse>(
aliasSelector,
(p, d) => this.RawDispatch.IndicesUpdateAliasesDispatch<IndicesOperationResponse>(p, d)
);
Expand All @@ -33,7 +33,7 @@ public IIndicesOperationResponse Alias(Func<AliasDescriptor, AliasDescriptor> al
/// <inheritdoc />
public Task<IIndicesOperationResponse> AliasAsync(IAliasRequest aliasRequest)
{
return this.DispatchAsync<IAliasRequest, AliasRequestParameters, IndicesOperationResponse, IIndicesOperationResponse>(
return this.Dispatcher.DispatchAsync<IAliasRequest, AliasRequestParameters, IndicesOperationResponse, IIndicesOperationResponse>(
aliasRequest,
(p, d) => this.RawDispatch.IndicesUpdateAliasesDispatchAsync<IndicesOperationResponse>(p, d)
);
Expand All @@ -42,7 +42,7 @@ public Task<IIndicesOperationResponse> AliasAsync(IAliasRequest aliasRequest)
/// <inheritdoc />
public Task<IIndicesOperationResponse> AliasAsync(Func<AliasDescriptor, AliasDescriptor> aliasSelector)
{
return this.DispatchAsync<AliasDescriptor, AliasRequestParameters, IndicesOperationResponse, IIndicesOperationResponse>(
return this.Dispatcher.DispatchAsync<AliasDescriptor, AliasRequestParameters, IndicesOperationResponse, IIndicesOperationResponse>(
aliasSelector,
(p, d) => this.RawDispatch.IndicesUpdateAliasesDispatchAsync<IndicesOperationResponse>(p, d)
);
Expand All @@ -51,7 +51,7 @@ public Task<IIndicesOperationResponse> AliasAsync(Func<AliasDescriptor, AliasDes
/// <inheritdoc />
public IGetAliasesResponse GetAlias(Func<GetAliasDescriptor, GetAliasDescriptor> GetAliasDescriptor)
{
return this.Dispatch<GetAliasDescriptor, GetAliasRequestParameters, GetAliasesResponse>(
return this.Dispatcher.Dispatch<GetAliasDescriptor, GetAliasRequestParameters, GetAliasesResponse>(
GetAliasDescriptor,
(p, d) => this.RawDispatch.IndicesGetAliasDispatch<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -62,7 +62,7 @@ public IGetAliasesResponse GetAlias(Func<GetAliasDescriptor, GetAliasDescriptor>
/// <inheritdoc />
public IGetAliasesResponse GetAlias(IGetAliasRequest GetAliasRequest)
{
return this.Dispatch<IGetAliasRequest, GetAliasRequestParameters, GetAliasesResponse>(
return this.Dispatcher.Dispatch<IGetAliasRequest, GetAliasRequestParameters, GetAliasesResponse>(
GetAliasRequest,
(p, d) => this.RawDispatch.IndicesGetAliasDispatch<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -73,7 +73,7 @@ public IGetAliasesResponse GetAlias(IGetAliasRequest GetAliasRequest)
/// <inheritdoc />
public Task<IGetAliasesResponse> GetAliasAsync(Func<GetAliasDescriptor, GetAliasDescriptor> GetAliasDescriptor)
{
return this.DispatchAsync<GetAliasDescriptor, GetAliasRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
return this.Dispatcher.DispatchAsync<GetAliasDescriptor, GetAliasRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
GetAliasDescriptor,
(p, d) => this.RawDispatch.IndicesGetAliasDispatchAsync<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -84,7 +84,7 @@ public Task<IGetAliasesResponse> GetAliasAsync(Func<GetAliasDescriptor, GetAlias
/// <inheritdoc />
public Task<IGetAliasesResponse> GetAliasAsync(IGetAliasRequest GetAliasRequest)
{
return this.DispatchAsync<IGetAliasRequest, GetAliasRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
return this.Dispatcher.DispatchAsync<IGetAliasRequest, GetAliasRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
GetAliasRequest,
(p, d) => this.RawDispatch.IndicesGetAliasDispatchAsync<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -96,7 +96,7 @@ public Task<IGetAliasesResponse> GetAliasAsync(IGetAliasRequest GetAliasRequest)
/// <inheritdoc />
public IGetAliasesResponse GetAliases(Func<GetAliasesDescriptor, GetAliasesDescriptor> getAliasesDescriptor)
{
return this.Dispatch<GetAliasesDescriptor, GetAliasesRequestParameters, GetAliasesResponse>(
return this.Dispatcher.Dispatch<GetAliasesDescriptor, GetAliasesRequestParameters, GetAliasesResponse>(
getAliasesDescriptor,
(p, d) => this.RawDispatch.IndicesGetAliasesDispatch<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -107,7 +107,7 @@ public IGetAliasesResponse GetAliases(Func<GetAliasesDescriptor, GetAliasesDescr
/// <inheritdoc />
public IGetAliasesResponse GetAliases(IGetAliasesRequest getAliasesRequest)
{
return this.Dispatch<IGetAliasesRequest, GetAliasesRequestParameters, GetAliasesResponse>(
return this.Dispatcher.Dispatch<IGetAliasesRequest, GetAliasesRequestParameters, GetAliasesResponse>(
getAliasesRequest,
(p, d) => this.RawDispatch.IndicesGetAliasesDispatch<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -118,7 +118,7 @@ public IGetAliasesResponse GetAliases(IGetAliasesRequest getAliasesRequest)
/// <inheritdoc />
public Task<IGetAliasesResponse> GetAliasesAsync(Func<GetAliasesDescriptor, GetAliasesDescriptor> getAliasesDescriptor)
{
return this.DispatchAsync<GetAliasesDescriptor, GetAliasesRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
return this.Dispatcher.DispatchAsync<GetAliasesDescriptor, GetAliasesRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
getAliasesDescriptor,
(p, d) => this.RawDispatch.IndicesGetAliasesDispatchAsync<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -129,7 +129,7 @@ public Task<IGetAliasesResponse> GetAliasesAsync(Func<GetAliasesDescriptor, GetA
/// <inheritdoc />
public Task<IGetAliasesResponse> GetAliasesAsync(IGetAliasesRequest getAliasesRequest)
{
return this.DispatchAsync<IGetAliasesRequest, GetAliasesRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
return this.Dispatcher.DispatchAsync<IGetAliasesRequest, GetAliasesRequestParameters, GetAliasesResponse, IGetAliasesResponse>(
getAliasesRequest,
(p, d) => this.RawDispatch.IndicesGetAliasesDispatchAsync<GetAliasesResponse>(
p.DeserializationState(new GetAliasesConverter(DeserializeGetAliasesResponse))
Expand All @@ -140,7 +140,7 @@ public Task<IGetAliasesResponse> GetAliasesAsync(IGetAliasesRequest getAliasesRe
/// <inheritdoc />
public IPutAliasResponse PutAlias(IPutAliasRequest putAliasRequest)
{
return this.Dispatch<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse>(
return this.Dispatcher.Dispatch<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse>(
putAliasRequest,
(p, d) => this.RawDispatch.IndicesPutAliasDispatch<PutAliasResponse>(p, d)
);
Expand All @@ -149,7 +149,7 @@ public IPutAliasResponse PutAlias(IPutAliasRequest putAliasRequest)
/// <inheritdoc />
public Task<IPutAliasResponse> PutAliasAsync(IPutAliasRequest putAliasRequest)
{
return this.DispatchAsync<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse, IPutAliasResponse>(
return this.Dispatcher.DispatchAsync<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse, IPutAliasResponse>(
putAliasRequest,
(p, d) => this.RawDispatch.IndicesPutAliasDispatchAsync<PutAliasResponse>(p, d)
);
Expand All @@ -158,7 +158,7 @@ public Task<IPutAliasResponse> PutAliasAsync(IPutAliasRequest putAliasRequest)
/// <inheritdoc />
public IPutAliasResponse PutAlias(Func<PutAliasDescriptor, PutAliasDescriptor> putAliasDescriptor)
{
return this.Dispatch<PutAliasDescriptor, PutAliasRequestParameters, PutAliasResponse>(
return this.Dispatcher.Dispatch<PutAliasDescriptor, PutAliasRequestParameters, PutAliasResponse>(
putAliasDescriptor,
(p, d) => this.RawDispatch.IndicesPutAliasDispatch<PutAliasResponse>(p, d)
);
Expand All @@ -167,7 +167,7 @@ public IPutAliasResponse PutAlias(Func<PutAliasDescriptor, PutAliasDescriptor> p
/// <inheritdoc />
public Task<IPutAliasResponse> PutAliasAsync(Func<PutAliasDescriptor, PutAliasDescriptor> putAliasDescriptor)
{
return this.DispatchAsync<PutAliasDescriptor, PutAliasRequestParameters, PutAliasResponse, IPutAliasResponse>(
return this.Dispatcher.DispatchAsync<PutAliasDescriptor, PutAliasRequestParameters, PutAliasResponse, IPutAliasResponse>(
putAliasDescriptor,
(p, d) => this.RawDispatch.IndicesPutAliasDispatchAsync<PutAliasResponse>(p, d)
);
Expand All @@ -176,7 +176,7 @@ public Task<IPutAliasResponse> PutAliasAsync(Func<PutAliasDescriptor, PutAliasDe
/// <inheritdoc />
public IDeleteAliasResponse DeleteAlias(IDeleteAliasRequest deleteAliasRequest)
{
return this.Dispatch<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse>(
return this.Dispatcher.Dispatch<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse>(
deleteAliasRequest,
(p, d) => this.RawDispatch.IndicesDeleteAliasDispatch<DeleteAliasResponse>(p)
);
Expand All @@ -185,7 +185,7 @@ public IDeleteAliasResponse DeleteAlias(IDeleteAliasRequest deleteAliasRequest)
/// <inheritdoc />
public Task<IDeleteAliasResponse> DeleteAliasAsync(IDeleteAliasRequest deleteAliasRequest)
{
return this.DispatchAsync<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse, IDeleteAliasResponse>(
return this.Dispatcher.DispatchAsync<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse, IDeleteAliasResponse>(
deleteAliasRequest,
(p, d) => this.RawDispatch.IndicesDeleteAliasDispatchAsync<DeleteAliasResponse>(p)
);
Expand All @@ -195,7 +195,7 @@ public Task<IDeleteAliasResponse> DeleteAliasAsync(IDeleteAliasRequest deleteAli
public IDeleteAliasResponse DeleteAlias<T>(Func<DeleteAliasDescriptor<T>, DeleteAliasDescriptor<T>> deleteAliasDescriptor)
where T : class
{
return this.Dispatch<DeleteAliasDescriptor<T>, DeleteAliasRequestParameters, DeleteAliasResponse>(
return this.Dispatcher.Dispatch<DeleteAliasDescriptor<T>, DeleteAliasRequestParameters, DeleteAliasResponse>(
deleteAliasDescriptor,
(p, d) => this.RawDispatch.IndicesDeleteAliasDispatch<DeleteAliasResponse>(p)
);
Expand All @@ -205,7 +205,7 @@ public IDeleteAliasResponse DeleteAlias<T>(Func<DeleteAliasDescriptor<T>, Delete
public Task<IDeleteAliasResponse> DeleteAliasAsync<T>(Func<DeleteAliasDescriptor<T>, DeleteAliasDescriptor<T>> deleteAliasDescriptor)
where T : class
{
return this.DispatchAsync<DeleteAliasDescriptor<T>, DeleteAliasRequestParameters, DeleteAliasResponse, IDeleteAliasResponse>(
return this.Dispatcher.DispatchAsync<DeleteAliasDescriptor<T>, DeleteAliasRequestParameters, DeleteAliasResponse, IDeleteAliasResponse>(
deleteAliasDescriptor,
(p, d) => this.RawDispatch.IndicesDeleteAliasDispatchAsync<DeleteAliasResponse>(p)
);
Expand Down
8 changes: 4 additions & 4 deletions src/Nest/ElasticClient-Analyze.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public partial class ElasticClient
/// <inheritdoc />
public IAnalyzeResponse Analyze(Func<AnalyzeDescriptor, AnalyzeDescriptor> analyzeSelector)
{
return this.Dispatch<AnalyzeDescriptor, AnalyzeRequestParameters, AnalyzeResponse>(
return this.Dispatcher.Dispatch<AnalyzeDescriptor, AnalyzeRequestParameters, AnalyzeResponse>(
analyzeSelector,
(p, d) =>
{
Expand All @@ -24,7 +24,7 @@ public IAnalyzeResponse Analyze(Func<AnalyzeDescriptor, AnalyzeDescriptor> analy
/// <inheritdoc />
public IAnalyzeResponse Analyze(IAnalyzeRequest analyzeRequest)
{
return this.Dispatch<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse>(
return this.Dispatcher.Dispatch<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse>(
analyzeRequest,
(p, d) =>
{
Expand All @@ -39,7 +39,7 @@ public IAnalyzeResponse Analyze(IAnalyzeRequest analyzeRequest)
/// <inheritdoc />
public Task<IAnalyzeResponse> AnalyzeAsync(Func<AnalyzeDescriptor, AnalyzeDescriptor> analyzeSelector)
{
return this.DispatchAsync<AnalyzeDescriptor, AnalyzeRequestParameters, AnalyzeResponse, IAnalyzeResponse>(
return this.Dispatcher.DispatchAsync<AnalyzeDescriptor, AnalyzeRequestParameters, AnalyzeResponse, IAnalyzeResponse>(
analyzeSelector,
(p, d) =>
{
Expand All @@ -54,7 +54,7 @@ public Task<IAnalyzeResponse> AnalyzeAsync(Func<AnalyzeDescriptor, AnalyzeDescri
/// <inheritdoc />
public Task<IAnalyzeResponse> AnalyzeAsync(IAnalyzeRequest analyzeRequest)
{
return this.DispatchAsync<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse, IAnalyzeResponse>(
return this.Dispatcher.DispatchAsync<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse, IAnalyzeResponse>(
analyzeRequest,
(p, d) =>
{
Expand Down
8 changes: 4 additions & 4 deletions src/Nest/ElasticClient-Bulk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public partial class ElasticClient
/// <inheritdoc />
public IBulkResponse Bulk(IBulkRequest bulkRequest)
{
return this.Dispatch<IBulkRequest, BulkRequestParameters, BulkResponse>(
return this.Dispatcher.Dispatch<IBulkRequest, BulkRequestParameters, BulkResponse>(
bulkRequest,
(p, d) =>
{
Expand All @@ -24,7 +24,7 @@ public IBulkResponse Bulk(IBulkRequest bulkRequest)
/// <inheritdoc />
public IBulkResponse Bulk(Func<BulkDescriptor, BulkDescriptor> bulkSelector)
{
return this.Dispatch<BulkDescriptor, BulkRequestParameters, BulkResponse>(
return this.Dispatcher.Dispatch<BulkDescriptor, BulkRequestParameters, BulkResponse>(
bulkSelector,
(p, d) =>
{
Expand All @@ -37,7 +37,7 @@ public IBulkResponse Bulk(Func<BulkDescriptor, BulkDescriptor> bulkSelector)
/// <inheritdoc />
public Task<IBulkResponse> BulkAsync(IBulkRequest bulkRequest)
{
return this.DispatchAsync<IBulkRequest, BulkRequestParameters, BulkResponse, IBulkResponse>(
return this.Dispatcher.DispatchAsync<IBulkRequest, BulkRequestParameters, BulkResponse, IBulkResponse>(
bulkRequest,
(p, d) =>
{
Expand All @@ -50,7 +50,7 @@ public Task<IBulkResponse> BulkAsync(IBulkRequest bulkRequest)
/// <inheritdoc />
public Task<IBulkResponse> BulkAsync(Func<BulkDescriptor, BulkDescriptor> bulkSelector)
{
return this.DispatchAsync<BulkDescriptor, BulkRequestParameters, BulkResponse, IBulkResponse>(
return this.Dispatcher.DispatchAsync<BulkDescriptor, BulkRequestParameters, BulkResponse, IBulkResponse>(
bulkSelector,
(p, d) =>
{
Expand Down
Loading