Skip to content

Commit 2f041ef

Browse files
committed
Ensure TransportConfiguration and Descriptor use the same defaults
1 parent d79db9f commit 2f041ef

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

src/Elastic.Transport/Configuration/TransportConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public TransportConfiguration(
100100

101101
MetaHeaderProvider = productRegistration?.MetaHeaderProvider;
102102
UrlFormatter = new UrlFormatter(this);
103-
StatusCodeToResponseSuccess = (m, i) => ProductRegistration.HttpStatusCodeClassifier(m, i);
103+
StatusCodeToResponseSuccess = ProductRegistration.HttpStatusCodeClassifier;
104104
UserAgent = UserAgent.Create(ProductRegistration.Name, ProductRegistration.GetType());
105105

106106
if (nodePool is CloudNodePool cloudPool)

src/Elastic.Transport/Configuration/TransportConfigurationDescriptor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected TransportConfigurationDescriptorBase(NodePool nodePool, IRequestInvoke
9090
_metaHeaderProvider = productRegistration?.MetaHeaderProvider;
9191

9292
_urlFormatter = new UrlFormatter(this);
93-
_statusCodeToResponseSuccess = (m, i) => _productRegistration.HttpStatusCodeClassifier(m, i);
93+
_statusCodeToResponseSuccess = _productRegistration.HttpStatusCodeClassifier;
9494
_userAgent = Transport.UserAgent.Create(_productRegistration.Name, _productRegistration.GetType());
9595

9696
if (nodePool is CloudNodePool cloudPool)

tests/Elastic.Transport.Tests/Configuration/TransportConfigurationTests.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5+
using System;
56
using System.Security.Cryptography.X509Certificates;
67
using System.Threading;
78
using FluentAssertions;
@@ -24,6 +25,22 @@ public void CopiesAllDefaults()
2425
config.Should().BeEquivalentTo(newConfig);
2526
}
2627

28+
[Fact]
29+
public void SameDefaults()
30+
{
31+
ITransportConfiguration config = new TransportConfiguration();
32+
ITransportConfiguration newConfig = new TransportConfigurationDescriptor();
33+
34+
config.Should().BeEquivalentTo(newConfig, c => c
35+
.Excluding(p=>p.BootstrapLock)
36+
.Excluding(p=>p.NodePool.LastUpdate)
37+
);
38+
39+
config.BootstrapLock.CurrentCount.Should().Be(newConfig.BootstrapLock.CurrentCount);
40+
config.NodePool.LastUpdate
41+
.Should().BeCloseTo(newConfig.NodePool.LastUpdate, TimeSpan.FromMilliseconds(100));
42+
}
43+
2744
#if !NETFRAMEWORK
2845
[Fact]
2946
public void CopiesAllProperties()

0 commit comments

Comments
 (0)