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
6 changes: 3 additions & 3 deletions benchmarks/Benchmarks/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
},
"Elastic.Transport": {
"type": "Transitive",
"resolved": "0.3.1",
"contentHash": "zjY9FwRW77/jDctjIOZecuvRrGRuLg0IDMulT8jQr0ycsU4Ikde8uj5pUTkkkWyEmGRgjzf477QkeKGyq8AqVQ==",
"resolved": "0.3.2",
"contentHash": "saT+26tm2xsXEbCnZHP0bsQNUQbWrLQ2J9tlzAnxPHKsrnNbcuegNDTfZy8GJdrQNbg4tsnLerzThgkU8rYHbA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0",
"System.Buffers": "4.5.1",
Expand Down Expand Up @@ -1129,7 +1129,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "0.3.1"
"Elastic.Transport": "0.3.2"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/Profiling/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
},
"Elastic.Transport": {
"type": "Transitive",
"resolved": "0.3.1",
"contentHash": "zjY9FwRW77/jDctjIOZecuvRrGRuLg0IDMulT8jQr0ycsU4Ikde8uj5pUTkkkWyEmGRgjzf477QkeKGyq8AqVQ==",
"resolved": "0.3.2",
"contentHash": "saT+26tm2xsXEbCnZHP0bsQNUQbWrLQ2J9tlzAnxPHKsrnNbcuegNDTfZy8GJdrQNbg4tsnLerzThgkU8rYHbA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0",
"System.Buffers": "4.5.1",
Expand Down Expand Up @@ -65,7 +65,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "0.3.1"
"Elastic.Transport": "0.3.2"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
},
"Elastic.Transport": {
"type": "Transitive",
"resolved": "0.3.1",
"contentHash": "zjY9FwRW77/jDctjIOZecuvRrGRuLg0IDMulT8jQr0ycsU4Ikde8uj5pUTkkkWyEmGRgjzf477QkeKGyq8AqVQ==",
"resolved": "0.3.2",
"contentHash": "saT+26tm2xsXEbCnZHP0bsQNUQbWrLQ2J9tlzAnxPHKsrnNbcuegNDTfZy8GJdrQNbg4tsnLerzThgkU8rYHbA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0",
"System.Buffers": "4.5.1",
Expand Down Expand Up @@ -148,7 +148,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "0.3.1"
"Elastic.Transport": "0.3.2"
}
}
},
Expand Down Expand Up @@ -192,8 +192,8 @@
},
"Elastic.Transport": {
"type": "Transitive",
"resolved": "0.3.1",
"contentHash": "zjY9FwRW77/jDctjIOZecuvRrGRuLg0IDMulT8jQr0ycsU4Ikde8uj5pUTkkkWyEmGRgjzf477QkeKGyq8AqVQ==",
"resolved": "0.3.2",
"contentHash": "saT+26tm2xsXEbCnZHP0bsQNUQbWrLQ2J9tlzAnxPHKsrnNbcuegNDTfZy8GJdrQNbg4tsnLerzThgkU8rYHbA==",
"dependencies": {
"Microsoft.CSharp": "4.7.0",
"System.Buffers": "4.5.1",
Expand Down Expand Up @@ -400,7 +400,7 @@
"elastic.clients.elasticsearch": {
"type": "Project",
"dependencies": {
"Elastic.Transport": "0.3.1",
"Elastic.Transport": "0.3.2",
"System.Reflection.Emit": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public ElasticsearchClientProductRegistration(Type markerType) : base(markerType
public static ElasticsearchClientProductRegistration DefaultForElasticsearchClientsElasticsearch { get; } = new(typeof(ElasticsearchClient));

/// <summary>
/// Elastic.Clients.Elasticsearch handles 404 in its <see cref="ResponseBase.IsValid" />, we do not want the low level client throwing
/// Elastic.Clients.Elasticsearch handles 404 in its <see cref="ElasticsearchResponseBase.IsValid" />, we do not want the low level client throwing
/// exceptions
/// when <see cref="ITransportConfiguration.ThrowExceptions" /> is enabled for 404's. The client is in charge of
/// composing paths
Expand All @@ -25,12 +25,12 @@ public override bool HttpStatusCodeClassifier(HttpMethod method, int statusCode)
statusCode is >= 200 and < 300 or 404;

/// <summary>
/// Makes the low level transport aware of Elastic.Clients.Elasticsearch's <see cref="ResponseBase" />
/// Makes the low level transport aware of Elastic.Clients.Elasticsearch's <see cref="ElasticsearchResponseBase" />
/// so that it can peek in to its exposed error when reporting failures.
/// </summary>
public override bool TryGetServerErrorReason<TResponse>(TResponse response, out string? reason)
{
if (response is not ResponseBase r)
if (response is not ElasticsearchResponseBase r)
return base.TryGetServerErrorReason(response, out reason);
reason = r.ServerError?.Error?.ToString();
return !string.IsNullOrEmpty(reason);
Expand Down
4 changes: 2 additions & 2 deletions src/Elastic.Clients.Elasticsearch/Common/Infer/Inferrer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ public Inferrer(IElasticsearchClientSettings elasticsearchClientSettings)
// Action<MultiGetResponseFormatter.MultiHitTuple, IJsonFormatterResolver, ICollection<IMultiGetHit<object>>>>();
//CreateSearchResponseDelegates =
// new ConcurrentDictionary<Type,
// Action<MultiSearchResponseFormatter.SearchHitTuple, IJsonFormatterResolver, IDictionary<string, IResponse>>>();
// Action<MultiSearchResponseFormatter.SearchHitTuple, IJsonFormatterResolver, IDictionary<string, IElasticsearchResponse>>>();
}

//internal ConcurrentDictionary<Type, Action<MultiGetResponseFormatter.MultiHitTuple, IJsonFormatterResolver, ICollection<IMultiGetHit<object>>>
// >
// CreateMultiHitDelegates { get; }

//internal ConcurrentDictionary<Type,
// Action<MultiSearchResponseFormatter.SearchHitTuple, IJsonFormatterResolver, IDictionary<string, IResponse>>>
// Action<MultiSearchResponseFormatter.SearchHitTuple, IJsonFormatterResolver, IDictionary<string, IElasticsearchResponse>>>
// CreateSearchResponseDelegates { get; }

private FieldResolver FieldResolver { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Elastic.Clients.Elasticsearch
{
public abstract class ExistsResponseBase : ResponseBase
public abstract class ExistsResponseBase : ElasticsearchResponseBase
{
public bool Exists => ApiCall is {Success: true, HttpStatusCode: 200};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Nullable>annotations</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.Transport" Version="0.3.1" />
<PackageReference Include="Elastic.Transport" Version="0.3.2" />
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Reflection.Emit" Version="4.3.0" />
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ private async Task<BulkAllResponse> RetryDocuments(long page, int backOffRetries
return await BulkAsync(retryDocuments, page, backOffRetries).ConfigureAwait(false);
}

private Exception ThrowOnBadBulk(IResponse response, string message)
private Exception ThrowOnBadBulk(IElasticsearchResponse response, string message)
{
_incrementFailed();
_partitionedBulkRequest.BackPressure?.Release();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.AsyncSearch
{
public partial class AsyncSearchStatusResponse : ResponseBase
public partial class AsyncSearchStatusResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("completion_status")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.AsyncSearch
{
public partial class DeleteAsyncSearchResponse : ResponseBase
public partial class DeleteAsyncSearchResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("acknowledged")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class BulkResponse : ResponseBase
public partial class BulkResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("errors")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class ClosePointInTimeResponse : ResponseBase
public partial class ClosePointInTimeResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("num_freed")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Cluster
{
public partial class ClusterAllocationExplainResponse : ResponseBase
public partial class ClusterAllocationExplainResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("allocate_explanation")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Cluster
{
public partial class ClusterHealthResponse : ResponseBase
public partial class ClusterHealthResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("active_primary_shards")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Cluster
{
public partial class ClusterPendingTasksResponse : ResponseBase
public partial class ClusterPendingTasksResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("tasks")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Cluster
{
public partial class ClusterStateResponse : ResponseBase
public partial class ClusterStateResponse : ElasticsearchResponseBase
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class CountResponse : ResponseBase
public partial class CountResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("count")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class CreateResponse : ResponseBase
public partial class CreateResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("forced_refresh")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class DeleteResponse : ResponseBase
public partial class DeleteResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("forced_refresh")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Eql
{
public partial class DeleteEqlResponse : ResponseBase
public partial class DeleteEqlResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("acknowledged")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Eql
{
public partial class EqlGetStatusResponse : ResponseBase
public partial class EqlGetStatusResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("completion_status")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class GetResponse<TDocument> : ResponseBase
public partial class GetResponse<TDocument> : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("fields")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.IndexManagement
{
public partial class DeleteResponse : ResponseBase
public partial class DeleteResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("acknowledged")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.IndexManagement
{
public partial class RefreshResponse : ResponseBase
public partial class RefreshResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("_shards")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class IndexResponse : ResponseBase
public partial class IndexResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("forced_refresh")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class OpenPointInTimeResponse : ResponseBase
public partial class OpenPointInTimeResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("id")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class PingResponse : ResponseBase
public partial class PingResponse : ElasticsearchResponseBase
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class SearchResponse<TDocument> : ResponseBase
public partial class SearchResponse<TDocument> : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("aggregations")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch
{
public partial class SourceResponse<TDocument> : ResponseBase
public partial class SourceResponse<TDocument> : ElasticsearchResponseBase
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Sql
{
public partial class SqlClearCursorResponse : ResponseBase
public partial class SqlClearCursorResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("succeeded")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Sql
{
public partial class SqlDeleteAsyncResponse : ResponseBase
public partial class SqlDeleteAsyncResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("acknowledged")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Sql
{
public partial class SqlGetAsyncResponse : ResponseBase
public partial class SqlGetAsyncResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("columns")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Sql
{
public partial class SqlGetAsyncStatusResponse : ResponseBase
public partial class SqlGetAsyncStatusResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("completion_status")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Sql
{
public partial class SqlQueryResponse : ResponseBase
public partial class SqlQueryResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("columns")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#nullable restore
namespace Elastic.Clients.Elasticsearch.Tasks
{
public partial class GetTasksResponse : ResponseBase
public partial class GetTasksResponse : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("completed")]
Expand Down
Loading