From c4e52a247b92bf6436a92ca7ef057b34fd26e661 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 14 Dec 2022 12:02:04 +0000 Subject: [PATCH] Update to Elastic.Transport 0.4.5 --- benchmarks/Benchmarks/packages.lock.json | 6 ++-- benchmarks/Profiling/packages.lock.json | 6 ++-- .../packages.lock.json | 36 +++++++++---------- .../Client/ElasticsearchClient.cs | 4 +-- .../ElasticsearchResponseBaseExtensions.cs | 4 ++- .../Elastic.Clients.Elasticsearch.csproj | 2 +- .../Helpers/BulkAllObservable.cs | 2 +- .../packages.lock.json | 36 +++++++++---------- src/Playground/packages.lock.json | 6 ++-- .../Tests.ClusterLauncher/packages.lock.json | 18 +++++----- .../Tests.Core/Client/FixedResponseClient.cs | 6 ++-- .../Tests.Core/Extensions/ShouldExtensions.cs | 18 ---------- tests/Tests.Core/packages.lock.json | 6 ++-- tests/Tests.Domain/packages.lock.json | 6 ++-- tests/Tests/Tests.csproj | 2 +- tests/Tests/packages.lock.json | 14 ++++---- 16 files changed, 78 insertions(+), 94 deletions(-) diff --git a/benchmarks/Benchmarks/packages.lock.json b/benchmarks/Benchmarks/packages.lock.json index df7a8ff861c..1633e0c3116 100644 --- a/benchmarks/Benchmarks/packages.lock.json +++ b/benchmarks/Benchmarks/packages.lock.json @@ -67,8 +67,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1195,7 +1195,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } } diff --git a/benchmarks/Profiling/packages.lock.json b/benchmarks/Profiling/packages.lock.json index de0de546e14..240c050df66 100644 --- a/benchmarks/Profiling/packages.lock.json +++ b/benchmarks/Profiling/packages.lock.json @@ -31,8 +31,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -131,7 +131,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } } diff --git a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json index 58a52540640..bae1bd74296 100644 --- a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json +++ b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json @@ -37,8 +37,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -143,7 +143,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } }, @@ -183,8 +183,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -332,7 +332,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } }, @@ -381,8 +381,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -529,7 +529,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } }, @@ -569,8 +569,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -709,7 +709,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } }, @@ -749,8 +749,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -849,7 +849,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } }, @@ -889,8 +889,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -989,7 +989,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } } } diff --git a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs index ad30b037a8b..448966b775b 100644 --- a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs +++ b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs @@ -553,8 +553,8 @@ private static void ForceAccept(TRequest request, internal static void ForceJson(IRequestConfiguration requestConfiguration) { - requestConfiguration.Accept = RequestData.MimeType; - requestConfiguration.ContentType = RequestData.MimeType; + requestConfiguration.Accept = RequestData.DefaultMimeType; + requestConfiguration.ContentType = RequestData.DefaultMimeType; } internal static void ForceTextPlain(IRequestConfiguration requestConfiguration) diff --git a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchResponseBaseExtensions.cs b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchResponseBaseExtensions.cs index a5335125c42..aca4334e42a 100644 --- a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchResponseBaseExtensions.cs +++ b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchResponseBaseExtensions.cs @@ -8,5 +8,7 @@ namespace Elastic.Clients.Elasticsearch; public static class ElasticsearchResponseExtensions { - public static bool IsSuccess(this ElasticsearchResponse response) => response.ApiCallDetails is not null && response.ApiCallDetails.HasSuccessfulStatusCode; + public static bool IsSuccess(this ElasticsearchResponse response) => response.ApiCallDetails is not null + && response.ApiCallDetails.HasSuccessfulStatusCode + && response.ApiCallDetails.HasExpectedContentType; } diff --git a/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj b/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj index 288fae59f3a..89581aaf1b2 100644 --- a/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj +++ b/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj @@ -18,7 +18,7 @@ annotations - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs index fb6b97ee818..1476b89f690 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs @@ -156,7 +156,7 @@ private async Task BulkAsync(IList buffer, long page, int ba _compositeCancelToken.ThrowIfCancellationRequested(); _bulkResponseCallback?.Invoke(response); - if (!response.ApiCallDetails.HasSuccessfulStatusCode) + if (!response.ApiCallDetails.HasSuccessfulStatusCode || !response.ApiCallDetails.HasExpectedContentType) return await HandleBulkRequestAsync(buffer, page, backOffRetries, response).ConfigureAwait(false); var retryableDocuments = new List(); diff --git a/src/Elastic.Clients.Elasticsearch/packages.lock.json b/src/Elastic.Clients.Elasticsearch/packages.lock.json index e48beb683ad..2d92b8bc470 100644 --- a/src/Elastic.Clients.Elasticsearch/packages.lock.json +++ b/src/Elastic.Clients.Elasticsearch/packages.lock.json @@ -22,9 +22,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.3, )", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "requested": "[0.4.5, )", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -163,9 +163,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.3, )", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "requested": "[0.4.5, )", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -347,9 +347,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.3, )", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "requested": "[0.4.5, )", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -539,9 +539,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.3, )", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "requested": "[0.4.5, )", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -714,9 +714,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.3, )", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "requested": "[0.4.5, )", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -849,9 +849,9 @@ }, "Elastic.Transport": { "type": "Direct", - "requested": "[0.4.3, )", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "requested": "[0.4.5, )", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", diff --git a/src/Playground/packages.lock.json b/src/Playground/packages.lock.json index 9fd4362dd33..bc095cb0d8b 100644 --- a/src/Playground/packages.lock.json +++ b/src/Playground/packages.lock.json @@ -48,8 +48,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -153,7 +153,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { diff --git a/tests/Tests.ClusterLauncher/packages.lock.json b/tests/Tests.ClusterLauncher/packages.lock.json index 76512ddc2ed..3850ff69d7d 100644 --- a/tests/Tests.ClusterLauncher/packages.lock.json +++ b/tests/Tests.ClusterLauncher/packages.lock.json @@ -75,8 +75,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1271,7 +1271,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { @@ -1388,8 +1388,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -2588,7 +2588,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { @@ -2705,8 +2705,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -3905,7 +3905,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { diff --git a/tests/Tests.Core/Client/FixedResponseClient.cs b/tests/Tests.Core/Client/FixedResponseClient.cs index f51213addee..592fb0970ab 100644 --- a/tests/Tests.Core/Client/FixedResponseClient.cs +++ b/tests/Tests.Core/Client/FixedResponseClient.cs @@ -17,7 +17,7 @@ public static ElasticsearchClient Create( object response, int statusCode = 200, Func modifySettings = null, - string contentType = RequestData.MimeType, + string contentType = RequestData.DefaultMimeType, Exception exception = null ) { @@ -29,7 +29,7 @@ public static ElasticsearchClientSettings CreateConnectionSettings( object response, int statusCode = 200, Func modifySettings = null, - string contentType = RequestData.MimeType, + string contentType = RequestData.DefaultMimeType, Exception exception = null, Serializer serializer = null ) @@ -46,7 +46,7 @@ public static ElasticsearchClientSettings CreateConnectionSettings( break; default: { - responseBytes = contentType == RequestData.MimeType + responseBytes = contentType == RequestData.DefaultMimeType ? serializer.SerializeToBytes(response, TestClient.Default.ElasticsearchClientSettings.MemoryStreamFactory) : Encoding.UTF8.GetBytes(response.ToString()); diff --git a/tests/Tests.Core/Extensions/ShouldExtensions.cs b/tests/Tests.Core/Extensions/ShouldExtensions.cs index 98d58d693a2..1bde90d60df 100644 --- a/tests/Tests.Core/Extensions/ShouldExtensions.cs +++ b/tests/Tests.Core/Extensions/ShouldExtensions.cs @@ -4,7 +4,6 @@ using Elastic.Transport; using FluentAssertions; -using Elastic.Clients.Elasticsearch; using Tests.Core.Client; using Elastic.Transport.Products.Elasticsearch; @@ -24,23 +23,6 @@ public static void ShouldBeValid(this ElasticsearchResponse response, string mes public static void ShouldNotBeValid(this ElasticsearchResponse response) => response.IsValidResponse.Should().BeFalse("{0}", response.DebugInformation); - public static void ShouldBeSuccess(this ElasticsearchResponse response) => - response.ApiCallDetails.HasSuccessfulStatusCode.Should().BeTrue("{0}", response.DebugInformation); - - //public static void ShouldAdhereToSourceSerializerWhenSet(this Project project) - //{ - // var usingSourceSerializer = TestClient.Configuration.Random.SourceSerializer; - // project.Should().NotBeNull(); - // if (!usingSourceSerializer) - // { - // project.SourceOnly.Should().BeNull(); - // return; - // } - // project.SourceOnly.Should().NotBeNull(); - // project.SourceOnly.NotWrittenByDefaultSerializer.Should().Be("written"); - // project.SourceOnly.NotReadByDefaultSerializer.Should().Be("read"); - //} - public static void ShouldBeTrue(this bool b, IUrlParameter p) => b.Should().BeTrue(p?.GetString(TestClient.DefaultInMemoryClient.ElasticsearchClientSettings) ?? "NULL"); } diff --git a/tests/Tests.Core/packages.lock.json b/tests/Tests.Core/packages.lock.json index 5a41abde4cf..f785208de56 100644 --- a/tests/Tests.Core/packages.lock.json +++ b/tests/Tests.Core/packages.lock.json @@ -137,8 +137,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1589,7 +1589,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": { diff --git a/tests/Tests.Domain/packages.lock.json b/tests/Tests.Domain/packages.lock.json index 35b97de0107..d9ce1ad0e28 100644 --- a/tests/Tests.Domain/packages.lock.json +++ b/tests/Tests.Domain/packages.lock.json @@ -57,8 +57,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1142,7 +1142,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } }, "tests.configuration": { diff --git a/tests/Tests/Tests.csproj b/tests/Tests/Tests.csproj index 6dc95877b0a..b22891ffab8 100644 --- a/tests/Tests/Tests.csproj +++ b/tests/Tests/Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/tests/Tests/packages.lock.json b/tests/Tests/packages.lock.json index a2f90ff7457..28a442d9fa7 100644 --- a/tests/Tests/packages.lock.json +++ b/tests/Tests/packages.lock.json @@ -31,11 +31,11 @@ }, "Elastic.Transport.VirtualizedCluster": { "type": "Direct", - "requested": "[0.4.3, )", - "resolved": "0.4.3", - "contentHash": "U4Ss5iT3uuhzSo8es0TWh2HIeRENEyIq+0VsedJR7fjq3dbiErIqBR5bU3mA8D4b2Agac2sKNThVuGfdZHcxtg==", + "requested": "[0.4.5, )", + "resolved": "0.4.5", + "contentHash": "uQzPNr3JUUItoIhRucZ+64djkOuue+Yb+SdayHFo/HBq5bVLGblC/tZN0T8yfp8uh+pQk1Wt8HcpthrY+YKdig==", "dependencies": { - "Elastic.Transport": "0.4.3" + "Elastic.Transport": "0.4.5" } }, "FSharp.Core": { @@ -195,8 +195,8 @@ }, "Elastic.Transport": { "type": "Transitive", - "resolved": "0.4.3", - "contentHash": "U4yHxScZG7YMDJJ9KGGWfhNx543NQmWlNPILyrd5UF0VMFfjuTZ+RXtWRCX8xMrqcSl4pUBKE+G4GoIVA65ZUQ==", + "resolved": "0.4.5", + "contentHash": "iy3ekUGcbHCDAWCcaG7+IERXouKJ6ta3CXiqAGwdhu1FYudqnAzo1UBdPeQQHmYYGNvQ/cqLHAUQW+1Zh/i6KA==", "dependencies": { "Microsoft.CSharp": "4.7.0", "System.Buffers": "4.5.1", @@ -1492,7 +1492,7 @@ "elastic.clients.elasticsearch": { "type": "Project", "dependencies": { - "Elastic.Transport": "[0.4.3, )" + "Elastic.Transport": "[0.4.5, )" } }, "elastic.clients.elasticsearch.jsonnetserializer": {