Skip to content

Add RequestParams overload without optional content type #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Add RequestParams overload without optional content type #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Elasticsearch.Net/ElasticLowLevelClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ public Task<TResponse> DoRequestAsync<TResponse>(HttpMethod method, string path,
protected internal TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams, string contentType = null, string accept = null)
where TRequestParams : class, IRequestParameters, new()
{
if (contentType.IsNullOrEmpty()) return requestParams;
if (contentType.IsNullOrEmpty() && accept.IsNullOrEmpty()) return requestParams;

Copy link
Member

@Mpdreamz Mpdreamz Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

requestParams ??= new TRequestParams();
if (requestParams.RequestConfiguration == null) requestParams.RequestConfiguration = new RequestConfiguration();
requestParams.RequestConfiguration ??= new RequestConfiguration();
if (!contentType.IsNullOrEmpty() && requestParams.RequestConfiguration.ContentType.IsNullOrEmpty())
requestParams.RequestConfiguration.ContentType = contentType;
if (!accept.IsNullOrEmpty() && requestParams.RequestConfiguration.Accept.IsNullOrEmpty())
Expand Down
6 changes: 5 additions & 1 deletion src/Elasticsearch.Net/NamespacedClientProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ protected Task<TResponse> DoRequestAsync<TResponse>(HttpMethod post, string url,

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

protected TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams, string contentType = null)
protected TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams, string contentType)
where TRequestParams : class, IRequestParameters, new()
=> _client.RequestParams(requestParams, contentType ?? ContentType, contentType ?? ContentType);

protected TRequestParams RequestParams<TRequestParams>(TRequestParams requestParams)
where TRequestParams : class, IRequestParameters, new()
=> _client.RequestParams(requestParams, ContentType, ContentType);

// ReSharper disable once UnassignedGetOnlyAutoProperty intended to be overridden
protected virtual string ContentType { get; }
}
Expand Down