Skip to content

Commit 429cc63

Browse files
author
Stephane Landelle
committed
minor clean up
1 parent babb5be commit 429cc63

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/NettyRequestFactory.java

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -266,63 +266,65 @@ public NettyRequest newNettyRequest(Request request, UriComponents uri, boolean
266266
nettyRequest = new NettyRequest(httpRequest, body);
267267
}
268268

269+
HttpHeaders headers = httpRequest.headers();
270+
269271
if (method != HttpMethod.CONNECT) {
270272
// assign headers as configured on request
271273
for (Entry<String, List<String>> header : request.getHeaders()) {
272-
httpRequest.headers().set(header.getKey(), header.getValue());
274+
headers.set(header.getKey(), header.getValue());
273275
}
274276

275277
if (isNonEmpty(request.getCookies()))
276-
httpRequest.headers().set(HttpHeaders.Names.COOKIE, CookieEncoder.encode(request.getCookies()));
278+
headers.set(HttpHeaders.Names.COOKIE, CookieEncoder.encode(request.getCookies()));
277279

278280
if (config.isCompressionEnabled())
279-
httpRequest.headers().set(HttpHeaders.Names.ACCEPT_ENCODING, GZIP_DEFLATE);
281+
headers.set(HttpHeaders.Names.ACCEPT_ENCODING, GZIP_DEFLATE);
280282
}
281283

282284
if (body != null) {
283285
if (body.getContentLength() < 0)
284-
httpRequest.headers().set(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED);
286+
headers.set(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED);
285287
else
286-
httpRequest.headers().set(HttpHeaders.Names.CONTENT_LENGTH, body.getContentLength());
288+
headers.set(HttpHeaders.Names.CONTENT_LENGTH, body.getContentLength());
287289

288290
if (body.getContentType() != null)
289-
httpRequest.headers().set(HttpHeaders.Names.CONTENT_TYPE, body.getContentType());
291+
headers.set(HttpHeaders.Names.CONTENT_TYPE, body.getContentType());
290292
}
291293

292294
// connection header and friends
293295
boolean webSocket = isWebSocket(uri.getScheme());
294296
if (method != HttpMethod.CONNECT && webSocket) {
295-
httpRequest.headers().set(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET);
296-
httpRequest.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.UPGRADE);
297-
httpRequest.headers().set(HttpHeaders.Names.ORIGIN, "http://" + uri.getHost() + ":" + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort()));
298-
httpRequest.headers().set(HttpHeaders.Names.SEC_WEBSOCKET_KEY, getKey());
299-
httpRequest.headers().set(HttpHeaders.Names.SEC_WEBSOCKET_VERSION, "13");
300-
301-
} else if (!httpRequest.headers().contains(HttpHeaders.Names.CONNECTION)) {
302-
httpRequest.headers().set(HttpHeaders.Names.CONNECTION, keepAliveHeaderValue(config));
297+
headers.set(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET)//
298+
.set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.UPGRADE)//
299+
.set(HttpHeaders.Names.ORIGIN, "http://" + uri.getHost() + ":" + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort()))//
300+
.set(HttpHeaders.Names.SEC_WEBSOCKET_KEY, getKey())//
301+
.set(HttpHeaders.Names.SEC_WEBSOCKET_VERSION, "13");
302+
303+
} else if (!headers.contains(HttpHeaders.Names.CONNECTION)) {
304+
headers.set(HttpHeaders.Names.CONNECTION, keepAliveHeaderValue(config));
303305
}
304306

305307
String hostHeader = hostHeader(request, uri);
306308
if (hostHeader != null)
307-
httpRequest.headers().set(HttpHeaders.Names.HOST, hostHeader);
309+
headers.set(HttpHeaders.Names.HOST, hostHeader);
308310

309311
Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
310312
String authorizationHeader = authorizationHeader(request, uri, proxyServer, realm);
311313
if (authorizationHeader != null)
312314
// don't override authorization but append
313-
httpRequest.headers().add(HttpHeaders.Names.AUTHORIZATION, authorizationHeader);
315+
headers.add(HttpHeaders.Names.AUTHORIZATION, authorizationHeader);
314316

315317
String proxyAuthorizationHeader = proxyAuthorizationHeader(request, proxyServer, method);
316318
if (proxyAuthorizationHeader != null)
317-
httpRequest.headers().set(HttpHeaders.Names.PROXY_AUTHORIZATION, proxyAuthorizationHeader);
319+
headers.set(HttpHeaders.Names.PROXY_AUTHORIZATION, proxyAuthorizationHeader);
318320

319321
// Add default accept headers
320-
if (!httpRequest.headers().contains(HttpHeaders.Names.ACCEPT))
321-
httpRequest.headers().set(HttpHeaders.Names.ACCEPT, "*/*");
322+
if (!headers.contains(HttpHeaders.Names.ACCEPT))
323+
headers.set(HttpHeaders.Names.ACCEPT, "*/*");
322324

323325
// Add default user agent
324-
if (!httpRequest.headers().contains(HttpHeaders.Names.USER_AGENT) && config.getUserAgent() != null)
325-
httpRequest.headers().set(HttpHeaders.Names.USER_AGENT, config.getUserAgent());
326+
if (!headers.contains(HttpHeaders.Names.USER_AGENT) && config.getUserAgent() != null)
327+
headers.set(HttpHeaders.Names.USER_AGENT, config.getUserAgent());
326328

327329
return nettyRequest;
328330
}

0 commit comments

Comments
 (0)