Skip to content

7x/remove response interface #3670

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 9 commits into from
Apr 17, 2019
Merged

7x/remove response interface #3670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be95924
remove CatResponse
Mpdreamz Apr 15, 2019
dc9879d
progress commit
Mpdreamz Apr 15, 2019
2cd7a79
things compile again
Mpdreamz Apr 15, 2019
31c21d6
found more cases
Mpdreamz Apr 15, 2019
280bc79
fixed compilation
Mpdreamz Apr 15, 2019
c4e524b
fix unit tests
Mpdreamz Apr 15, 2019
1940de9
DoRequestAsync no longer needs to transform task to interface result
Mpdreamz Apr 15, 2019
7906ff2
Simplified SuggestDictionary serializer by doing a straight cast
Mpdreamz Apr 16, 2019
9b307c0
wrote codestandard test to assert new rule around response interfaces…
Mpdreamz Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions src/Nest/Aggregations/Metric/TopHits/TopHitsAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ internal TopHitsAggregate(IList<LazyDocument> hits, IJsonFormatterResolver forma

public TotalHits Total { get; set; }

private IEnumerable<Hit<TDocument>> ConvertHits<TDocument>()
private IEnumerable<IHit<TDocument>> ConvertHits<TDocument>()
where TDocument : class
{
var formatter = _formatterResolver.GetFormatter<Hit<TDocument>>();
var formatter = _formatterResolver.GetFormatter<IHit<TDocument>>();
return _hits.Select(h =>
{
var reader = new JsonReader(h.Bytes);
return formatter.Deserialize(ref reader, _formatterResolver);
});
}

public IReadOnlyCollection<Hit<TDocument>> Hits<TDocument>()
public IReadOnlyCollection<IHit<TDocument>> Hits<TDocument>()
where TDocument : class =>
ConvertHits<TDocument>().ToList().AsReadOnly();

Expand Down
16 changes: 8 additions & 8 deletions src/Nest/Cat/CatAliases/ElasticClient-CatAliases.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,41 @@ namespace Nest
public partial interface IElasticClient
{
/// <inheritdoc />
ICatResponse<CatAliasesRecord> CatAliases(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null);
CatResponse<CatAliasesRecord> CatAliases(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null);

/// <inheritdoc />
ICatResponse<CatAliasesRecord> CatAliases(ICatAliasesRequest request);
CatResponse<CatAliasesRecord> CatAliases(ICatAliasesRequest request);

/// <inheritdoc />
Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null,
Task<CatResponse<CatAliasesRecord>> CatAliasesAsync(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null,
CancellationToken ct = default(CancellationToken)
);

/// <inheritdoc />
Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request,
Task<CatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request,
CancellationToken ct = default(CancellationToken)
);
}

public partial class ElasticClient
{
/// <inheritdoc />
public ICatResponse<CatAliasesRecord> CatAliases(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null) =>
public CatResponse<CatAliasesRecord> CatAliases(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null) =>
CatAliases(selector.InvokeOrDefault(new CatAliasesDescriptor()));

/// <inheritdoc />
public ICatResponse<CatAliasesRecord> CatAliases(ICatAliasesRequest request) =>
public CatResponse<CatAliasesRecord> CatAliases(ICatAliasesRequest request) =>
DoCat<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request);

/// <inheritdoc />
public Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(
public Task<CatResponse<CatAliasesRecord>> CatAliasesAsync(
Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null,
CancellationToken ct = default
) =>
CatAliasesAsync(selector.InvokeOrDefault(new CatAliasesDescriptor()), ct);

/// <inheritdoc />
public Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request, CancellationToken ct = default) =>
public Task<CatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request, CancellationToken ct = default) =>
DoCatAsync<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request, ct);
}
}
16 changes: 8 additions & 8 deletions src/Nest/Cat/CatAllocation/ElasticClient-CatAllocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,41 @@ namespace Nest
public partial interface IElasticClient
{
/// <inheritdoc />
ICatResponse<CatAllocationRecord> CatAllocation(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null);
CatResponse<CatAllocationRecord> CatAllocation(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null);

/// <inheritdoc />
ICatResponse<CatAllocationRecord> CatAllocation(ICatAllocationRequest request);
CatResponse<CatAllocationRecord> CatAllocation(ICatAllocationRequest request);

/// <inheritdoc />
Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(
Task<CatResponse<CatAllocationRecord>> CatAllocationAsync(
Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null,
CancellationToken ct = default
);

/// <inheritdoc />
Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request,
Task<CatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request,
CancellationToken ct = default
);
}

public partial class ElasticClient
{
/// <inheritdoc />
public ICatResponse<CatAllocationRecord> CatAllocation(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null) =>
public CatResponse<CatAllocationRecord> CatAllocation(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null) =>
CatAllocation(selector.InvokeOrDefault(new CatAllocationDescriptor()));

/// <inheritdoc />
public ICatResponse<CatAllocationRecord> CatAllocation(ICatAllocationRequest request) =>
public CatResponse<CatAllocationRecord> CatAllocation(ICatAllocationRequest request) =>
DoCat<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(request);

/// <inheritdoc />
public Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(
public Task<CatResponse<CatAllocationRecord>> CatAllocationAsync(
Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null,
CancellationToken ct = default
) => CatAllocationAsync(selector.InvokeOrDefault(new CatAllocationDescriptor()), ct);

/// <inheritdoc />
public Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request, CancellationToken ct = default) =>
public Task<CatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request, CancellationToken ct = default) =>
DoCatAsync<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(request,ct);
}
}
16 changes: 8 additions & 8 deletions src/Nest/Cat/CatCount/ElasticClient-CatCount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,39 @@ namespace Nest
public partial interface IElasticClient
{
/// <inheritdoc />
ICatResponse<CatCountRecord> CatCount(Func<CatCountDescriptor, ICatCountRequest> selector = null);
CatResponse<CatCountRecord> CatCount(Func<CatCountDescriptor, ICatCountRequest> selector = null);

/// <inheritdoc />
ICatResponse<CatCountRecord> CatCount(ICatCountRequest request);
CatResponse<CatCountRecord> CatCount(ICatCountRequest request);

/// <inheritdoc />
Task<ICatResponse<CatCountRecord>> CatCountAsync(Func<CatCountDescriptor, ICatCountRequest> selector = null,
Task<CatResponse<CatCountRecord>> CatCountAsync(Func<CatCountDescriptor, ICatCountRequest> selector = null,
CancellationToken ct = default
);

/// <inheritdoc />
Task<ICatResponse<CatCountRecord>> CatCountAsync(ICatCountRequest request, CancellationToken ct = default);
Task<CatResponse<CatCountRecord>> CatCountAsync(ICatCountRequest request, CancellationToken ct = default);
}

public partial class ElasticClient
{
/// <inheritdoc />
public ICatResponse<CatCountRecord> CatCount(Func<CatCountDescriptor, ICatCountRequest> selector = null) =>
public CatResponse<CatCountRecord> CatCount(Func<CatCountDescriptor, ICatCountRequest> selector = null) =>
CatCount(selector.InvokeOrDefault(new CatCountDescriptor()));

/// <inheritdoc />
public ICatResponse<CatCountRecord> CatCount(ICatCountRequest request) =>
public CatResponse<CatCountRecord> CatCount(ICatCountRequest request) =>
DoCat<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request);

/// <inheritdoc />
public Task<ICatResponse<CatCountRecord>> CatCountAsync(
public Task<CatResponse<CatCountRecord>> CatCountAsync(
Func<CatCountDescriptor, ICatCountRequest> selector = null,
CancellationToken ct = default
) =>
CatCountAsync(selector.InvokeOrDefault(new CatCountDescriptor()), ct);

/// <inheritdoc />
public Task<ICatResponse<CatCountRecord>> CatCountAsync(ICatCountRequest request, CancellationToken ct = default) =>
public Task<CatResponse<CatCountRecord>> CatCountAsync(ICatCountRequest request, CancellationToken ct = default) =>
DoCatAsync<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request, ct);
}
}
16 changes: 8 additions & 8 deletions src/Nest/Cat/CatFielddata/ElasticClient-CatFielddata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,41 @@ namespace Nest
public partial interface IElasticClient
{
/// <inheritdoc />
ICatResponse<CatFielddataRecord> CatFielddata(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null);
CatResponse<CatFielddataRecord> CatFielddata(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null);

/// <inheritdoc />
ICatResponse<CatFielddataRecord> CatFielddata(ICatFielddataRequest request);
CatResponse<CatFielddataRecord> CatFielddata(ICatFielddataRequest request);

/// <inheritdoc />
Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(
Task<CatResponse<CatFielddataRecord>> CatFielddataAsync(
Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null,
CancellationToken ct = default(CancellationToken)
);

/// <inheritdoc />
Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request,
Task<CatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request,
CancellationToken ct = default(CancellationToken)
);
}

public partial class ElasticClient
{
/// <inheritdoc />
public ICatResponse<CatFielddataRecord> CatFielddata(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null) =>
public CatResponse<CatFielddataRecord> CatFielddata(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null) =>
CatFielddata(selector.InvokeOrDefault(new CatFielddataDescriptor()));

/// <inheritdoc />
public ICatResponse<CatFielddataRecord> CatFielddata(ICatFielddataRequest request) =>
public CatResponse<CatFielddataRecord> CatFielddata(ICatFielddataRequest request) =>
DoCat<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request);

/// <inheritdoc />
public Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(
public Task<CatResponse<CatFielddataRecord>> CatFielddataAsync(
Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null,
CancellationToken ct = default
) => CatFielddataAsync(selector.InvokeOrDefault(new CatFielddataDescriptor()), ct);

/// <inheritdoc />
public Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request, CancellationToken ct = default) =>
public Task<CatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request, CancellationToken ct = default) =>
DoCatAsync<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request, ct);
}
}
16 changes: 8 additions & 8 deletions src/Nest/Cat/CatHealth/ElasticClient-CatHealth.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,40 @@ namespace Nest
public partial interface IElasticClient
{
/// <inheritdoc />
ICatResponse<CatHealthRecord> CatHealth(Func<CatHealthDescriptor, ICatHealthRequest> selector = null);
CatResponse<CatHealthRecord> CatHealth(Func<CatHealthDescriptor, ICatHealthRequest> selector = null);

/// <inheritdoc />
ICatResponse<CatHealthRecord> CatHealth(ICatHealthRequest request);
CatResponse<CatHealthRecord> CatHealth(ICatHealthRequest request);

/// <inheritdoc />
Task<ICatResponse<CatHealthRecord>> CatHealthAsync(
Task<CatResponse<CatHealthRecord>> CatHealthAsync(
Func<CatHealthDescriptor, ICatHealthRequest> selector = null,
CancellationToken ct = default
);

/// <inheritdoc />
Task<ICatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request, CancellationToken ct = default
Task<CatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request, CancellationToken ct = default
);
}

public partial class ElasticClient
{
/// <inheritdoc />
public ICatResponse<CatHealthRecord> CatHealth(Func<CatHealthDescriptor, ICatHealthRequest> selector = null) =>
public CatResponse<CatHealthRecord> CatHealth(Func<CatHealthDescriptor, ICatHealthRequest> selector = null) =>
CatHealth(selector.InvokeOrDefault(new CatHealthDescriptor()));

/// <inheritdoc />
public ICatResponse<CatHealthRecord> CatHealth(ICatHealthRequest request) =>
public CatResponse<CatHealthRecord> CatHealth(ICatHealthRequest request) =>
DoCat<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request);

/// <inheritdoc />
public Task<ICatResponse<CatHealthRecord>> CatHealthAsync(
public Task<CatResponse<CatHealthRecord>> CatHealthAsync(
Func<CatHealthDescriptor, ICatHealthRequest> selector = null,
CancellationToken ct = default
) => CatHealthAsync(selector.InvokeOrDefault(new CatHealthDescriptor()), ct);

/// <inheritdoc />
public Task<ICatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request, CancellationToken ct = default) =>
public Task<CatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request, CancellationToken ct = default) =>
DoCatAsync<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request, ct);
}
}
18 changes: 9 additions & 9 deletions src/Nest/Cat/CatHelp/ElasticClient-CatHelp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,42 @@ namespace Nest
public partial interface IElasticClient
{
/// <inheritdoc />
ICatResponse<CatHelpRecord> CatHelp(Func<CatHelpDescriptor, ICatHelpRequest> selector = null);
CatResponse<CatHelpRecord> CatHelp(Func<CatHelpDescriptor, ICatHelpRequest> selector = null);

/// <inheritdoc />
ICatResponse<CatHelpRecord> CatHelp(ICatHelpRequest request);
CatResponse<CatHelpRecord> CatHelp(ICatHelpRequest request);

/// <inheritdoc />
Task<ICatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null,
Task<CatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null,
CancellationToken ct = default(CancellationToken)
);

/// <inheritdoc />
Task<ICatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request, CancellationToken ct = default(CancellationToken));
Task<CatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request, CancellationToken ct = default(CancellationToken));
}

public partial class ElasticClient
{
/// <inheritdoc />
public ICatResponse<CatHelpRecord> CatHelp(Func<CatHelpDescriptor, ICatHelpRequest> selector = null) =>
public CatResponse<CatHelpRecord> CatHelp(Func<CatHelpDescriptor, ICatHelpRequest> selector = null) =>
CatHelp(selector.InvokeOrDefault(new CatHelpDescriptor()));

/// <inheritdoc />
public ICatResponse<CatHelpRecord> CatHelp(ICatHelpRequest request)
public CatResponse<CatHelpRecord> CatHelp(ICatHelpRequest request)
{
request.RequestParameters.DeserializationOverride = DeserializeCatHelpResponse;
return DoRequest<ICatHelpRequest, CatResponse<CatHelpRecord>>(request, request.RequestParameters);
}

/// <inheritdoc />
public Task<ICatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null, CancellationToken ct = default) =>
public Task<CatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null, CancellationToken ct = default) =>
CatHelpAsync(selector.InvokeOrDefault(new CatHelpDescriptor()), ct);

/// <inheritdoc />
public Task<ICatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request, CancellationToken ct = default)
public Task<CatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request, CancellationToken ct = default)
{
request.RequestParameters.DeserializationOverride = DeserializeCatHelpResponse;
return DoRequestAsync<ICatHelpRequest, ICatResponse<CatHelpRecord>, CatResponse<CatHelpRecord>>(request, request.RequestParameters, ct);
return DoRequestAsync<ICatHelpRequest, CatResponse<CatHelpRecord>>(request, request.RequestParameters, ct);
}

private static CatResponse<CatHelpRecord> DeserializeCatHelpResponse(IApiCallDetails response, Stream stream)
Expand Down
16 changes: 8 additions & 8 deletions src/Nest/Cat/CatIndices/ElasticClient-CatIndices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,41 @@ namespace Nest
public partial interface IElasticClient
{
/// <inheritdoc />
ICatResponse<CatIndicesRecord> CatIndices(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null);
CatResponse<CatIndicesRecord> CatIndices(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null);

/// <inheritdoc />
ICatResponse<CatIndicesRecord> CatIndices(ICatIndicesRequest request);
CatResponse<CatIndicesRecord> CatIndices(ICatIndicesRequest request);

/// <inheritdoc />
Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(
Task<CatResponse<CatIndicesRecord>> CatIndicesAsync(
Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null,
CancellationToken ct = default
);

/// <inheritdoc />
Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request,
Task<CatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request,
CancellationToken ct = default
);
}

public partial class ElasticClient
{
/// <inheritdoc />
public ICatResponse<CatIndicesRecord> CatIndices(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null) =>
public CatResponse<CatIndicesRecord> CatIndices(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null) =>
CatIndices(selector.InvokeOrDefault(new CatIndicesDescriptor()));

/// <inheritdoc />
public ICatResponse<CatIndicesRecord> CatIndices(ICatIndicesRequest request) =>
public CatResponse<CatIndicesRecord> CatIndices(ICatIndicesRequest request) =>
DoCat<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request);

/// <inheritdoc />
public Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(
public Task<CatResponse<CatIndicesRecord>> CatIndicesAsync(
Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null,
CancellationToken ct = default
) => CatIndicesAsync(selector.InvokeOrDefault(new CatIndicesDescriptor()), ct);

/// <inheritdoc />
public Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request, CancellationToken ct = default) =>
public Task<CatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request, CancellationToken ct = default) =>
DoCatAsync<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request, ct);
}
}
Loading