Skip to content

Commit 14e752c

Browse files
github-actions[bot]stevejgordon
github-actions[bot]
and
stevejgordon
authored
Update to Elastic.Transport 0.4.5 (#7102) (#7108)
Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>
1 parent 46a5971 commit 14e752c

File tree

16 files changed

+78
-94
lines changed

16 files changed

+78
-94
lines changed

‎benchmarks/Benchmarks/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
},
6868
"Elastic.Transport": {
6969
"type": "Transitive",
70-
"resolved": "0.4.3",
71-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
70+
"resolved": "0.4.5",
71+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
7272
"dependencies": {
7373
"Microsoft.CSharp": "4.7.0",
7474
"System.Buffers": "4.5.1",
@@ -1195,7 +1195,7 @@
11951195
"elastic.clients.elasticsearch": {
11961196
"type": "Project",
11971197
"dependencies": {
1198-
"Elastic.Transport": "[0.4.3, )"
1198+
"Elastic.Transport": "[0.4.5, )"
11991199
}
12001200
}
12011201
}

‎benchmarks/Profiling/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"Elastic.Transport": {
3333
"type": "Transitive",
34-
"resolved": "0.4.3",
35-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
34+
"resolved": "0.4.5",
35+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
3636
"dependencies": {
3737
"Microsoft.CSharp": "4.7.0",
3838
"System.Buffers": "4.5.1",
@@ -131,7 +131,7 @@
131131
"elastic.clients.elasticsearch": {
132132
"type": "Project",
133133
"dependencies": {
134-
"Elastic.Transport": "[0.4.3, )"
134+
"Elastic.Transport": "[0.4.5, )"
135135
}
136136
}
137137
}

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
},
3838
"Elastic.Transport": {
3939
"type": "Transitive",
40-
"resolved": "0.4.3",
41-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
40+
"resolved": "0.4.5",
41+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
4242
"dependencies": {
4343
"Microsoft.CSharp": "4.7.0",
4444
"System.Buffers": "4.5.1",
@@ -143,7 +143,7 @@
143143
"elastic.clients.elasticsearch": {
144144
"type": "Project",
145145
"dependencies": {
146-
"Elastic.Transport": "[0.4.3, )"
146+
"Elastic.Transport": "[0.4.5, )"
147147
}
148148
}
149149
},
@@ -183,8 +183,8 @@
183183
},
184184
"Elastic.Transport": {
185185
"type": "Transitive",
186-
"resolved": "0.4.3",
187-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
186+
"resolved": "0.4.5",
187+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
188188
"dependencies": {
189189
"Microsoft.CSharp": "4.7.0",
190190
"System.Buffers": "4.5.1",
@@ -332,7 +332,7 @@
332332
"elastic.clients.elasticsearch": {
333333
"type": "Project",
334334
"dependencies": {
335-
"Elastic.Transport": "[0.4.3, )"
335+
"Elastic.Transport": "[0.4.5, )"
336336
}
337337
}
338338
},
@@ -381,8 +381,8 @@
381381
},
382382
"Elastic.Transport": {
383383
"type": "Transitive",
384-
"resolved": "0.4.3",
385-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
384+
"resolved": "0.4.5",
385+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
386386
"dependencies": {
387387
"Microsoft.CSharp": "4.7.0",
388388
"System.Buffers": "4.5.1",
@@ -529,7 +529,7 @@
529529
"elastic.clients.elasticsearch": {
530530
"type": "Project",
531531
"dependencies": {
532-
"Elastic.Transport": "[0.4.3, )"
532+
"Elastic.Transport": "[0.4.5, )"
533533
}
534534
}
535535
},
@@ -569,8 +569,8 @@
569569
},
570570
"Elastic.Transport": {
571571
"type": "Transitive",
572-
"resolved": "0.4.3",
573-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
572+
"resolved": "0.4.5",
573+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
574574
"dependencies": {
575575
"Microsoft.CSharp": "4.7.0",
576576
"System.Buffers": "4.5.1",
@@ -709,7 +709,7 @@
709709
"elastic.clients.elasticsearch": {
710710
"type": "Project",
711711
"dependencies": {
712-
"Elastic.Transport": "[0.4.3, )"
712+
"Elastic.Transport": "[0.4.5, )"
713713
}
714714
}
715715
},
@@ -749,8 +749,8 @@
749749
},
750750
"Elastic.Transport": {
751751
"type": "Transitive",
752-
"resolved": "0.4.3",
753-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
752+
"resolved": "0.4.5",
753+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
754754
"dependencies": {
755755
"Microsoft.CSharp": "4.7.0",
756756
"System.Buffers": "4.5.1",
@@ -849,7 +849,7 @@
849849
"elastic.clients.elasticsearch": {
850850
"type": "Project",
851851
"dependencies": {
852-
"Elastic.Transport": "[0.4.3, )"
852+
"Elastic.Transport": "[0.4.5, )"
853853
}
854854
}
855855
},
@@ -889,8 +889,8 @@
889889
},
890890
"Elastic.Transport": {
891891
"type": "Transitive",
892-
"resolved": "0.4.3",
893-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
892+
"resolved": "0.4.5",
893+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
894894
"dependencies": {
895895
"Microsoft.CSharp": "4.7.0",
896896
"System.Buffers": "4.5.1",
@@ -989,7 +989,7 @@
989989
"elastic.clients.elasticsearch": {
990990
"type": "Project",
991991
"dependencies": {
992-
"Elastic.Transport": "[0.4.3, )"
992+
"Elastic.Transport": "[0.4.5, )"
993993
}
994994
}
995995
}

‎src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ private static void ForceAccept<TRequest, TRequestParameters>(TRequest request,
553553

554554
internal static void ForceJson(IRequestConfiguration requestConfiguration)
555555
{
556-
requestConfiguration.Accept = RequestData.MimeType;
557-
requestConfiguration.ContentType = RequestData.MimeType;
556+
requestConfiguration.Accept = RequestData.DefaultMimeType;
557+
requestConfiguration.ContentType = RequestData.DefaultMimeType;
558558
}
559559

560560
internal static void ForceTextPlain(IRequestConfiguration requestConfiguration)

‎src/Elastic.Clients.Elasticsearch/Client/ElasticsearchResponseBaseExtensions.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ namespace Elastic.Clients.Elasticsearch;
88

99
public static class ElasticsearchResponseExtensions
1010
{
11-
public static bool IsSuccess(this ElasticsearchResponse response) => response.ApiCallDetails is not null && response.ApiCallDetails.HasSuccessfulStatusCode;
11+
public static bool IsSuccess(this ElasticsearchResponse response) => response.ApiCallDetails is not null
12+
&& response.ApiCallDetails.HasSuccessfulStatusCode
13+
&& response.ApiCallDetails.HasExpectedContentType;
1214
}

‎src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Nullable>annotations</Nullable>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Elastic.Transport" Version="0.4.3" />
21+
<PackageReference Include="Elastic.Transport" Version="0.4.5" />
2222
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.3.44">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private async Task<BulkAllResponse> BulkAsync(IList<T> buffer, long page, int ba
156156
_compositeCancelToken.ThrowIfCancellationRequested();
157157
_bulkResponseCallback?.Invoke(response);
158158

159-
if (!response.ApiCallDetails.HasSuccessfulStatusCode)
159+
if (!response.ApiCallDetails.HasSuccessfulStatusCode || !response.ApiCallDetails.HasExpectedContentType)
160160
return await HandleBulkRequestAsync(buffer, page, backOffRetries, response).ConfigureAwait(false);
161161

162162
var retryableDocuments = new List<T>();

‎src/Elastic.Clients.Elasticsearch/packages.lock.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
},
2323
"Elastic.Transport": {
2424
"type": "Direct",
25-
"requested": "[0.4.3, )",
26-
"resolved": "0.4.3",
27-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
25+
"requested": "[0.4.5, )",
26+
"resolved": "0.4.5",
27+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
2828
"dependencies": {
2929
"Microsoft.CSharp": "4.7.0",
3030
"System.Buffers": "4.5.1",
@@ -163,9 +163,9 @@
163163
},
164164
"Elastic.Transport": {
165165
"type": "Direct",
166-
"requested": "[0.4.3, )",
167-
"resolved": "0.4.3",
168-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
166+
"requested": "[0.4.5, )",
167+
"resolved": "0.4.5",
168+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
169169
"dependencies": {
170170
"Microsoft.CSharp": "4.7.0",
171171
"System.Buffers": "4.5.1",
@@ -347,9 +347,9 @@
347347
},
348348
"Elastic.Transport": {
349349
"type": "Direct",
350-
"requested": "[0.4.3, )",
351-
"resolved": "0.4.3",
352-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
350+
"requested": "[0.4.5, )",
351+
"resolved": "0.4.5",
352+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
353353
"dependencies": {
354354
"Microsoft.CSharp": "4.7.0",
355355
"System.Buffers": "4.5.1",
@@ -539,9 +539,9 @@
539539
},
540540
"Elastic.Transport": {
541541
"type": "Direct",
542-
"requested": "[0.4.3, )",
543-
"resolved": "0.4.3",
544-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
542+
"requested": "[0.4.5, )",
543+
"resolved": "0.4.5",
544+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
545545
"dependencies": {
546546
"Microsoft.CSharp": "4.7.0",
547547
"System.Buffers": "4.5.1",
@@ -714,9 +714,9 @@
714714
},
715715
"Elastic.Transport": {
716716
"type": "Direct",
717-
"requested": "[0.4.3, )",
718-
"resolved": "0.4.3",
719-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
717+
"requested": "[0.4.5, )",
718+
"resolved": "0.4.5",
719+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
720720
"dependencies": {
721721
"Microsoft.CSharp": "4.7.0",
722722
"System.Buffers": "4.5.1",
@@ -849,9 +849,9 @@
849849
},
850850
"Elastic.Transport": {
851851
"type": "Direct",
852-
"requested": "[0.4.3, )",
853-
"resolved": "0.4.3",
854-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
852+
"requested": "[0.4.5, )",
853+
"resolved": "0.4.5",
854+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
855855
"dependencies": {
856856
"Microsoft.CSharp": "4.7.0",
857857
"System.Buffers": "4.5.1",

‎src/Playground/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
},
4949
"Elastic.Transport": {
5050
"type": "Transitive",
51-
"resolved": "0.4.3",
52-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
51+
"resolved": "0.4.5",
52+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
5353
"dependencies": {
5454
"Microsoft.CSharp": "4.7.0",
5555
"System.Buffers": "4.5.1",
@@ -153,7 +153,7 @@
153153
"elastic.clients.elasticsearch": {
154154
"type": "Project",
155155
"dependencies": {
156-
"Elastic.Transport": "[0.4.3, )"
156+
"Elastic.Transport": "[0.4.5, )"
157157
}
158158
},
159159
"elastic.clients.elasticsearch.jsonnetserializer": {

‎tests/Tests.ClusterLauncher/packages.lock.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
},
7676
"Elastic.Transport": {
7777
"type": "Transitive",
78-
"resolved": "0.4.3",
79-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
78+
"resolved": "0.4.5",
79+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
8080
"dependencies": {
8181
"Microsoft.CSharp": "4.7.0",
8282
"System.Buffers": "4.5.1",
@@ -1271,7 +1271,7 @@
12711271
"elastic.clients.elasticsearch": {
12721272
"type": "Project",
12731273
"dependencies": {
1274-
"Elastic.Transport": "[0.4.3, )"
1274+
"Elastic.Transport": "[0.4.5, )"
12751275
}
12761276
},
12771277
"elastic.clients.elasticsearch.jsonnetserializer": {
@@ -1388,8 +1388,8 @@
13881388
},
13891389
"Elastic.Transport": {
13901390
"type": "Transitive",
1391-
"resolved": "0.4.3",
1392-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
1391+
"resolved": "0.4.5",
1392+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
13931393
"dependencies": {
13941394
"Microsoft.CSharp": "4.7.0",
13951395
"System.Buffers": "4.5.1",
@@ -2588,7 +2588,7 @@
25882588
"elastic.clients.elasticsearch": {
25892589
"type": "Project",
25902590
"dependencies": {
2591-
"Elastic.Transport": "[0.4.3, )"
2591+
"Elastic.Transport": "[0.4.5, )"
25922592
}
25932593
},
25942594
"elastic.clients.elasticsearch.jsonnetserializer": {
@@ -2705,8 +2705,8 @@
27052705
},
27062706
"Elastic.Transport": {
27072707
"type": "Transitive",
2708-
"resolved": "0.4.3",
2709-
"contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==",
2708+
"resolved": "0.4.5",
2709+
"contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==",
27102710
"dependencies": {
27112711
"Microsoft.CSharp": "4.7.0",
27122712
"System.Buffers": "4.5.1",
@@ -3905,7 +3905,7 @@
39053905
"elastic.clients.elasticsearch": {
39063906
"type": "Project",
39073907
"dependencies": {
3908-
"Elastic.Transport": "[0.4.3, )"
3908+
"Elastic.Transport": "[0.4.5, )"
39093909
}
39103910
},
39113911
"elastic.clients.elasticsearch.jsonnetserializer": {

‎tests/Tests.Core/Client/FixedResponseClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static ElasticsearchClient Create(
1717
object response,
1818
int statusCode = 200,
1919
Func<ElasticsearchClientSettings, ElasticsearchClientSettings> modifySettings = null,
20-
string contentType = RequestData.MimeType,
20+
string contentType = RequestData.DefaultMimeType,
2121
Exception exception = null
2222
)
2323
{
@@ -29,7 +29,7 @@ public static ElasticsearchClientSettings CreateConnectionSettings(
2929
object response,
3030
int statusCode = 200,
3131
Func<ElasticsearchClientSettings, ElasticsearchClientSettings> modifySettings = null,
32-
string contentType = RequestData.MimeType,
32+
string contentType = RequestData.DefaultMimeType,
3333
Exception exception = null,
3434
Serializer serializer = null
3535
)
@@ -46,7 +46,7 @@ public static ElasticsearchClientSettings CreateConnectionSettings(
4646
break;
4747
default:
4848
{
49-
responseBytes = contentType == RequestData.MimeType
49+
responseBytes = contentType == RequestData.DefaultMimeType
5050
? serializer.SerializeToBytes(response,
5151
TestClient.Default.ElasticsearchClientSettings.MemoryStreamFactory)
5252
: Encoding.UTF8.GetBytes(response.ToString());

0 commit comments

Comments
 (0)