Skip to content

Commit 1fbc364

Browse files
floberndflobernd
authored
Add copy constructor to RequestConfiguration{Descriptor} (#133)
1 parent 363f7a1 commit 1fbc364

File tree

3 files changed

+148
-15
lines changed

3 files changed

+148
-15
lines changed

‎src/Elastic.Transport/Components/Pipeline/RequestPipeline.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private RequestConfiguration PingAndSniffRequestConfiguration
5858
PingTimeout = PingTimeout,
5959
RequestTimeout = PingTimeout,
6060
Authentication = _requestData.AuthenticationHeader,
61-
EnableHttpPipelining = _requestData.HttpPipeliningEnabled,
61+
HttpPipeliningEnabled = _requestData.HttpPipeliningEnabled,
6262
ForceNode = _requestData.ForceNode
6363
};
6464

‎src/Elastic.Transport/Configuration/RequestConfiguration.cs‎

Lines changed: 93 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Collections.Generic;
77
using System.Collections.Specialized;
88
using System.Security.Cryptography.X509Certificates;
9+
910
using Elastic.Transport.Extensions;
1011

1112
namespace Elastic.Transport;
@@ -108,7 +109,6 @@ public interface IRequestConfiguration
108109
/// </summary>
109110
TimeSpan? RequestTimeout { get; }
110111

111-
112112
/// <summary> Specifies the headers from the response that should be parsed. </summary>
113113
HeadersList? ResponseHeadersToParse { get; }
114114

@@ -163,6 +163,48 @@ public record RequestConfiguration : IRequestConfiguration
163163
/// <summary> The default ping timeout when the connection is over HTTPS. Defaults to 5 seconds </summary>
164164
public static readonly TimeSpan DefaultPingTimeoutOnSsl = TimeSpan.FromSeconds(5);
165165

166+
/// <inheritdoc cref="IRequestConfiguration"/>
167+
public RequestConfiguration()
168+
{
169+
}
170+
171+
/// <inheritdoc cref="IRequestConfiguration"/>
172+
public RequestConfiguration(IRequestConfiguration config)
173+
{
174+
#if NET8_0_OR_GREATER
175+
ArgumentNullException.ThrowIfNull(config);
176+
#else
177+
if (config is null)
178+
throw new ArgumentNullException(nameof(config));
179+
#endif
180+
181+
Accept = config.Accept;
182+
AllowedStatusCodes = config.AllowedStatusCodes;
183+
Authentication = config.Authentication;
184+
ClientCertificates = (config.ClientCertificates is null) ? null : new X509CertificateCollection(config.ClientCertificates);
185+
ContentType = config.ContentType;
186+
DisableDirectStreaming = config.DisableDirectStreaming;
187+
DisableAuditTrail = config.DisableAuditTrail;
188+
DisablePings = config.DisablePings;
189+
DisableSniff = config.DisableSniff;
190+
HttpPipeliningEnabled = config.HttpPipeliningEnabled;
191+
EnableHttpCompression = config.EnableHttpCompression;
192+
ForceNode = config.ForceNode;
193+
MaxRetries = config.MaxRetries;
194+
MaxRetryTimeout = config.MaxRetryTimeout;
195+
OpaqueId = config.OpaqueId;
196+
PingTimeout = config.PingTimeout;
197+
RequestTimeout = config.RequestTimeout;
198+
RunAs = config.RunAs;
199+
ThrowExceptions = config.ThrowExceptions;
200+
TransferEncodingChunked = config.TransferEncodingChunked;
201+
Headers = (config.Headers is null) ? null : new NameValueCollection(config.Headers);
202+
EnableTcpStats = config.EnableTcpStats;
203+
EnableThreadPoolStats = config.EnableThreadPoolStats;
204+
ResponseHeadersToParse = (config.ResponseHeadersToParse is null) ? null : new HeadersList(config.ResponseHeadersToParse);
205+
ParseAllHeaders = config.ParseAllHeaders;
206+
RequestMetaData = config.RequestMetaData;
207+
}
166208

167209
/// <inheritdoc />
168210
public string? Accept { get; init; }
@@ -188,18 +230,12 @@ public record RequestConfiguration : IRequestConfiguration
188230
/// <inheritdoc />
189231
public bool? DisablePings { get; init; }
190232

191-
/// <inheritdoc />
192-
public bool? DisablePing { get; init; }
193-
194233
/// <inheritdoc />
195234
public bool? DisableSniff { get; init; }
196235

197236
/// <inheritdoc />
198237
public bool? HttpPipeliningEnabled { get; init; }
199238

200-
/// <inheritdoc />
201-
public bool? EnableHttpPipelining { get; init; } = true;
202-
203239
/// <inheritdoc />
204240
public bool? EnableHttpCompression { get; init; }
205241

@@ -247,7 +283,6 @@ public record RequestConfiguration : IRequestConfiguration
247283

248284
/// <inheritdoc />
249285
public RequestMetaData? RequestMetaData { get; init; }
250-
251286
}
252287

253288
/// <inheritdoc cref="IRequestConfiguration"/>
@@ -256,6 +291,40 @@ public class RequestConfigurationDescriptor : IRequestConfiguration
256291
/// <inheritdoc cref="IRequestConfiguration"/>
257292
public RequestConfigurationDescriptor() { }
258293

294+
/// <inheritdoc cref="IRequestConfiguration"/>
295+
public RequestConfigurationDescriptor(IRequestConfiguration? config)
296+
{
297+
if (config is null)
298+
return;
299+
300+
_accept = config.Accept;
301+
_allowedStatusCodes= config.AllowedStatusCodes;
302+
_authentication = config.Authentication;
303+
_clientCertificates = (config.ClientCertificates is null) ? null : new X509CertificateCollection(config.ClientCertificates);;
304+
_contentType = config.ContentType;
305+
_disableDirectStreaming = config.DisableDirectStreaming;
306+
_disableAuditTrail = config.DisableAuditTrail;
307+
_disablePings = config.DisablePings;
308+
_disableSniff = config.DisableSniff;
309+
_httpPipeliningEnabled = config.HttpPipeliningEnabled;
310+
_enableHttpCompression = config.EnableHttpCompression;
311+
_forceNode = config.ForceNode;
312+
_maxRetries = config.MaxRetries;
313+
_maxRetryTimeout = config.MaxRetryTimeout;
314+
_opaqueId = config.OpaqueId;
315+
_pingTimeout = config.PingTimeout;
316+
_requestTimeout = config.RequestTimeout;
317+
_runAs = config.RunAs;
318+
_throwExceptions = config.ThrowExceptions;
319+
_transferEncodingChunked = config.TransferEncodingChunked;
320+
_headers = (config.Headers is null) ? null : new NameValueCollection(config.Headers);
321+
_enableTcpStats = config.EnableTcpStats;
322+
_enableThreadPoolStats = config.EnableThreadPoolStats;
323+
_responseHeadersToParse = (config.ResponseHeadersToParse is null) ? null : new HeadersList(config.ResponseHeadersToParse);
324+
_parseAllHeaders = config.ParseAllHeaders;
325+
_requestMetaData = config.RequestMetaData;
326+
}
327+
259328
private string? _accept;
260329
private IReadOnlyCollection<int>? _allowedStatusCodes;
261330
private AuthorizationHeader? _authentication;
@@ -266,8 +335,10 @@ public RequestConfigurationDescriptor() { }
266335
private bool? _disablePings;
267336
private bool? _disableSniff;
268337
private bool? _httpPipeliningEnabled;
338+
private bool? _enableHttpCompression;
269339
private Uri? _forceNode;
270340
private int? _maxRetries;
341+
private TimeSpan? _maxRetryTimeout;
271342
private string? _opaqueId;
272343
private bool? _parseAllHeaders;
273344
private TimeSpan? _pingTimeout;
@@ -281,12 +352,6 @@ public RequestConfigurationDescriptor() { }
281352
private bool? _enableThreadPoolStats;
282353
private RequestMetaData? _requestMetaData;
283354

284-
#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
285-
private bool? _enableHttpCompression;
286-
private TimeSpan? _maxRetryTimeout;
287-
#pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
288-
289-
290355
/// <inheritdoc cref="IRequestConfiguration.RunAs"/>
291356
public RequestConfigurationDescriptor RunAs(string username)
292357
{
@@ -392,6 +457,13 @@ public RequestConfigurationDescriptor MaxRetries(int retry)
392457
return this;
393458
}
394459

460+
/// <inheritdoc cref="IRequestConfiguration.MaxRetryTimeout"/>
461+
public RequestConfigurationDescriptor MaxRetries(TimeSpan? timeout)
462+
{
463+
_maxRetryTimeout = timeout;
464+
return this;
465+
}
466+
395467
/// <inheritdoc cref="AuthorizationHeader"/>
396468
public RequestConfigurationDescriptor Authentication(AuthorizationHeader authentication)
397469
{
@@ -406,6 +478,13 @@ public RequestConfigurationDescriptor EnableHttpPipelining(bool enable = true)
406478
return this;
407479
}
408480

481+
/// <inheritdoc cref="IRequestConfiguration.EnableHttpCompression"/>
482+
public RequestConfigurationDescriptor EnableHttpCompression(bool enable = true)
483+
{
484+
_enableHttpCompression = enable;
485+
return this;
486+
}
487+
409488
/// <inheritdoc cref="IRequestConfiguration.ClientCertificates"/>
410489
public RequestConfigurationDescriptor ClientCertificates(X509CertificateCollection certificates)
411490
{

‎tests/Elastic.Transport.Tests/Configuration/RequestConfigurationTests.cs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// Licensed to Elasticsearch B.V under one or more agreements.
2+
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information
4+
5+
using System;
6+
using System.Security.Cryptography.X509Certificates;
7+
using System.Threading;
8+
using FluentAssertions;
9+
using Xunit;
10+
#if !NETFRAMEWORK
11+
using Soenneker.Utils.AutoBogus;
12+
#endif
13+
14+
namespace Elastic.Transport.Tests.Configuration;
15+
16+
public class RequestConfigurationTests
17+
{
18+
[Fact]
19+
public void CopiesAllDefaults()
20+
{
21+
var config = new RequestConfiguration();
22+
var newConfig = new RequestConfiguration(config);
23+
24+
config.Should().BeEquivalentTo(newConfig);
25+
}
26+
27+
[Fact]
28+
public void SameDefaults()
29+
{
30+
IRequestConfiguration config = new RequestConfiguration();
31+
IRequestConfiguration newConfig = new RequestConfigurationDescriptor();
32+
33+
config.Should().BeEquivalentTo(newConfig);
34+
}
35+
36+
#if !NETFRAMEWORK
37+
[Fact]
38+
public void CopiesAllProperties()
39+
{
40+
var autoFaker = new AutoFaker<RequestConfiguration>();
41+
autoFaker.RuleFor(x => x.ClientCertificates, f => new X509CertificateCollection());
42+
43+
var config = autoFaker.Generate();
44+
config.Accept.Should().NotBeEmpty();
45+
config.ClientCertificates.Should().NotBeNull();
46+
47+
IRequestConfiguration newConfig = new RequestConfiguration(config);
48+
config.Should().BeEquivalentTo(newConfig);
49+
50+
IRequestConfiguration newDescriptor = new RequestConfigurationDescriptor(config);
51+
config.Should().BeEquivalentTo(newDescriptor);
52+
}
53+
#endif
54+
}

0 commit comments

Comments
 (0)