Skip to content

Commit fc29e6a

Browse files
committed
formatting of HttpConnection-CoreFx
1 parent e02f08c commit fc29e6a

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

src/Elasticsearch.Net/Connection/HttpConnection-CoreFx.cs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public virtual ElasticsearchResponse<TReturn> Request<TReturn>(RequestData reque
6666
{
6767
//TODO remove Stream response support in 6.0, closing the stream is sufficient on desktop/mono
6868
//but not on .NET core on linux HttpClient which proxies to curl.
69-
if (typeof(TReturn) == typeof(Stream) && ConnectionConfiguration.IsCurlHandler)
70-
throw new Exception(CanNotUseStreamResponsesWithCurlHandler);
69+
if (typeof(TReturn) == typeof(Stream) && ConnectionConfiguration.IsCurlHandler)
70+
throw new Exception(CanNotUseStreamResponsesWithCurlHandler);
7171

7272
var client = this.GetClient(requestData);
7373
var builder = new ResponseBuilder<TReturn>(requestData);
@@ -77,7 +77,7 @@ public virtual ElasticsearchResponse<TReturn> Request<TReturn>(RequestData reque
7777
var requestMessage = CreateHttpRequestMessage(requestData);
7878
responseMessage = client.SendAsync(requestMessage).GetAwaiter().GetResult();
7979
requestData.MadeItToResponse = true;
80-
builder.StatusCode = (int)responseMessage.StatusCode;
80+
builder.StatusCode = (int) responseMessage.StatusCode;
8181
IEnumerable<string> warnings;
8282
if (responseMessage.Headers.TryGetValues("Warning", out warnings))
8383
builder.DeprecationWarnings = warnings;
@@ -96,20 +96,21 @@ public virtual ElasticsearchResponse<TReturn> Request<TReturn>(RequestData reque
9696
{
9797
builder.Exception = e;
9898
}
99-
var response = builder.ToResponse();
99+
var response = builder.ToResponse();
100100
//explicit dispose of response not needed (as documented on MSDN) on desktop CLR
101101
//but we can not guarantee this is true for all HttpMessageHandler implementations
102-
if (typeof(TReturn) != typeof(Stream)) responseMessage?.Dispose();
103-
return response;
102+
if (typeof(TReturn) != typeof(Stream)) responseMessage?.Dispose();
103+
return response;
104104
}
105105

106106

107-
public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(RequestData requestData, CancellationToken cancellationToken) where TReturn : class
107+
public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(RequestData requestData,
108+
CancellationToken cancellationToken) where TReturn : class
108109
{
109110
//TODO remove Stream response support in 6.0, closing the stream is sufficient on desktop/mono
110111
//but not on .NET core on linux HttpClient which proxies to curl.
111-
if (typeof(TReturn) == typeof(Stream) && ConnectionConfiguration.IsCurlHandler)
112-
throw new Exception(CanNotUseStreamResponsesWithCurlHandler);
112+
if (typeof(TReturn) == typeof(Stream) && ConnectionConfiguration.IsCurlHandler)
113+
throw new Exception(CanNotUseStreamResponsesWithCurlHandler);
113114

114115
var client = this.GetClient(requestData);
115116
var builder = new ResponseBuilder<TReturn>(requestData, cancellationToken);
@@ -118,7 +119,8 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
118119
{
119120
var requestMessage = CreateHttpRequestMessage(requestData);
120121
responseMessage = await client.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
121-
builder.StatusCode = (int)responseMessage.StatusCode;
122+
requestData.MadeItToResponse = true;
123+
builder.StatusCode = (int) responseMessage.StatusCode;
122124
IEnumerable<string> warnings;
123125
if (responseMessage.Headers.TryGetValues("Warning", out warnings))
124126
builder.DeprecationWarnings = warnings;
@@ -137,11 +139,11 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
137139
{
138140
builder.Exception = e;
139141
}
140-
var response = await builder.ToResponseAsync().ConfigureAwait(false);
142+
var response = await builder.ToResponseAsync().ConfigureAwait(false);
141143
//explicit dispose of response not needed (as documented on MSDN) on desktop CLR
142144
//but we can not guarantee this is true for all HttpMessageHandler implementations
143-
if (typeof(TReturn) != typeof(Stream)) responseMessage?.Dispose();
144-
return response;
145+
if (typeof(TReturn) != typeof(Stream)) responseMessage?.Dispose();
146+
return response;
145147
}
146148

147149
private static readonly string MissingConnectionLimitMethodError =
@@ -179,8 +181,8 @@ protected virtual HttpClientHandler CreateHttpClientHandler(RequestData requestD
179181
var proxy = new WebProxy(uri);
180182
if (!string.IsNullOrEmpty(requestData.ProxyUsername))
181183
{
182-
var credentials = new NetworkCredential(requestData.ProxyUsername, requestData.ProxyPassword);
183-
proxy.Credentials = credentials;
184+
var credentials = new NetworkCredential(requestData.ProxyUsername, requestData.ProxyPassword);
185+
proxy.Credentials = credentials;
184186
}
185187
handler.Proxy = proxy;
186188
}

0 commit comments

Comments
 (0)