Skip to content

Commit 7098a28

Browse files
[Backport 7.7] Add RequestParams overload without optional cont… (#4660)
This commit adds back a RequestParams overload on NamespacedClientProxy in Elasticsearch.Net that does not accept a content type optional parameter, and removes the optional part of the parameter on the other overload, for backwards binary compatibility. Co-authored-by: Russ Cam <russ.cam@elastic.co>
1 parent ee4b2dd commit 7098a28

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/Elasticsearch.Net/ElasticLowLevelClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ public Task<TResponse> DoRequestAsync<TResponse>(HttpMethod method, string path,
7575
protected internal TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams, string contentType = null, string accept = null)
7676
where TRequestParams : class, IRequestParameters, new()
7777
{
78-
if (contentType.IsNullOrEmpty()) return requestParams;
78+
if (contentType.IsNullOrEmpty() && accept.IsNullOrEmpty()) return requestParams;
7979

8080
requestParams ??= new TRequestParams();
81-
if (requestParams.RequestConfiguration == null) requestParams.RequestConfiguration = new RequestConfiguration();
81+
requestParams.RequestConfiguration ??= new RequestConfiguration();
8282
if (!contentType.IsNullOrEmpty() && requestParams.RequestConfiguration.ContentType.IsNullOrEmpty())
8383
requestParams.RequestConfiguration.ContentType = contentType;
8484
if (!accept.IsNullOrEmpty() && requestParams.RequestConfiguration.Accept.IsNullOrEmpty())

src/Elasticsearch.Net/NamespacedClientProxy.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ protected Task<TResponse> DoRequestAsync<TResponse>(HttpMethod post, string url,
2020

2121
protected string Url(FormattableString formattable) => _client.Url(formattable);
2222

23-
protected TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams, string contentType = null)
23+
protected TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams, string contentType)
2424
where TRequestParams : class, IRequestParameters, new()
2525
=> _client.RequestParams(requestParams, contentType ?? ContentType, contentType ?? ContentType);
2626

27+
protected TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams)
28+
where TRequestParams : class, IRequestParameters, new()
29+
=> _client.RequestParams(requestParams, ContentType, ContentType);
30+
2731
// ReSharper disable once UnassignedGetOnlyAutoProperty intended to be overridden
2832
protected virtual string ContentType { get; }
2933
}

0 commit comments

Comments
 (0)