Skip to content

Commit 834c345

Browse files
slandelleslandelle
committed
minor clean up
1 parent e2c15f8 commit 834c345

File tree

2 files changed

+48
-46
lines changed

2 files changed

+48
-46
lines changed

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

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.asynchttpclient.util.HttpUtils.isWebSocket;
2121
import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
2222
import static org.asynchttpclient.ws.WebSocketUtils.getKey;
23+
import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
2324

2425
import java.io.IOException;
2526
import java.nio.charset.Charset;
@@ -61,7 +62,7 @@ public NettyRequestFactory(AsyncHttpClientConfig config) {
6162
}
6263

6364
protected List<String> getProxyAuthorizationHeader(Request request) {
64-
return request.getHeaders().get(HttpHeaders.Names.PROXY_AUTHORIZATION);
65+
return request.getHeaders().get(PROXY_AUTHORIZATION);
6566
}
6667

6768
private NettyBody body(Request request, boolean connect) throws IOException {
@@ -85,7 +86,7 @@ else if (request.getStreamData() != null)
8586
else if (isNonEmpty(request.getFormParams())) {
8687

8788
String contentType = null;
88-
if (!request.getHeaders().containsKey(HttpHeaders.Names.CONTENT_TYPE))
89+
if (!request.getHeaders().containsKey(CONTENT_TYPE))
8990
contentType = HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
9091

9192
nettyBody = new NettyByteBufferBody(urlEncodeFormParams(request.getFormParams(), bodyCharset), contentType);
@@ -114,12 +115,12 @@ else if (request.getBodyGenerator() != null)
114115
public void addAuthorizationHeader(HttpHeaders headers, String authorizationHeader) {
115116
if (authorizationHeader != null)
116117
// don't override authorization but append
117-
headers.add(HttpHeaders.Names.AUTHORIZATION, authorizationHeader);
118+
headers.add(AUTHORIZATION, authorizationHeader);
118119
}
119120

120121
public void setProxyAuthorizationHeader(HttpHeaders headers, String proxyAuthorizationHeader) {
121122
if (proxyAuthorizationHeader != null)
122-
headers.set(HttpHeaders.Names.PROXY_AUTHORIZATION, proxyAuthorizationHeader);
123+
headers.set(PROXY_AUTHORIZATION, proxyAuthorizationHeader);
123124
}
124125

125126
public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConnect, ProxyServer proxyServer)
@@ -158,40 +159,40 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
158159
}
159160

160161
if (isNonEmpty(request.getCookies()))
161-
headers.set(HttpHeaders.Names.COOKIE, CookieEncoder.encode(request.getCookies()));
162+
headers.set(COOKIE, CookieEncoder.encode(request.getCookies()));
162163

163-
if (config.isCompressionEnforced() && !headers.contains(HttpHeaders.Names.ACCEPT_ENCODING))
164-
headers.set(HttpHeaders.Names.ACCEPT_ENCODING, GZIP_DEFLATE);
164+
if (config.isCompressionEnforced() && !headers.contains(ACCEPT_ENCODING))
165+
headers.set(ACCEPT_ENCODING, GZIP_DEFLATE);
165166
}
166167

167168
if (body != null) {
168169
if (body.getContentLength() < 0)
169-
headers.set(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED);
170+
headers.set(TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED);
170171
else
171-
headers.set(HttpHeaders.Names.CONTENT_LENGTH, body.getContentLength());
172+
headers.set(CONTENT_LENGTH, body.getContentLength());
172173

173174
if (body.getContentType() != null)
174-
headers.set(HttpHeaders.Names.CONTENT_TYPE, body.getContentType());
175+
headers.set(CONTENT_TYPE, body.getContentType());
175176
}
176177

177178
// connection header and friends
178179
boolean webSocket = isWebSocket(uri.getScheme());
179180
if (!connect && webSocket) {
180181
String origin = "http://" + uri.getHost() + ":" + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort());
181-
headers.set(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET)//
182-
.set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.UPGRADE)//
183-
.set(HttpHeaders.Names.ORIGIN, origin)//
184-
.set(HttpHeaders.Names.SEC_WEBSOCKET_KEY, getKey())//
185-
.set(HttpHeaders.Names.SEC_WEBSOCKET_VERSION, "13");
182+
headers.set(UPGRADE, HttpHeaders.Values.WEBSOCKET)//
183+
.set(CONNECTION, HttpHeaders.Values.UPGRADE)//
184+
.set(ORIGIN, origin)//
185+
.set(SEC_WEBSOCKET_KEY, getKey())//
186+
.set(SEC_WEBSOCKET_VERSION, "13");
186187

187-
} else if (!headers.contains(HttpHeaders.Names.CONNECTION)) {
188+
} else if (!headers.contains(CONNECTION)) {
188189
String connectionHeaderValue = connectionHeader(allowConnectionPooling, httpVersion == HttpVersion.HTTP_1_1);
189190
if (connectionHeaderValue != null)
190-
headers.set(HttpHeaders.Names.CONNECTION, connectionHeaderValue);
191+
headers.set(CONNECTION, connectionHeaderValue);
191192
}
192193

193-
if (!headers.contains(HttpHeaders.Names.HOST))
194-
headers.set(HttpHeaders.Names.HOST, hostHeader(request, uri));
194+
if (!headers.contains(HOST))
195+
headers.set(HOST, hostHeader(request, uri));
195196

196197
Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
197198

@@ -201,12 +202,12 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
201202
setProxyAuthorizationHeader(headers, systematicProxyAuthorizationHeader(request, proxyServer, realm, connect));
202203

203204
// Add default accept headers
204-
if (!headers.contains(HttpHeaders.Names.ACCEPT))
205-
headers.set(HttpHeaders.Names.ACCEPT, "*/*");
205+
if (!headers.contains(ACCEPT))
206+
headers.set(ACCEPT, "*/*");
206207

207208
// Add default user agent
208-
if (!headers.contains(HttpHeaders.Names.USER_AGENT) && config.getUserAgent() != null)
209-
headers.set(HttpHeaders.Names.USER_AGENT, config.getUserAgent());
209+
if (!headers.contains(USER_AGENT) && config.getUserAgent() != null)
210+
headers.set(USER_AGENT, config.getUserAgent());
210211

211212
return nettyRequest;
212213
}

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

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
package org.asynchttpclient.netty.request;
1515

16+
import static io.netty.handler.codec.http.HttpHeaders.Names.*;
1617
import static org.asynchttpclient.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
1718
import static org.asynchttpclient.util.AsyncHttpProviderUtils.hostHeader;
1819
import static org.asynchttpclient.util.AsyncHttpProviderUtils.urlEncodeFormParams;
@@ -62,7 +63,7 @@ public NettyRequestFactory(AsyncHttpClientConfig config) {
6263
}
6364

6465
protected List<String> getProxyAuthorizationHeader(Request request) {
65-
return request.getHeaders().get(HttpHeaders.Names.PROXY_AUTHORIZATION);
66+
return request.getHeaders().get(PROXY_AUTHORIZATION);
6667
}
6768

6869
private NettyBody body(Request request, boolean connect) throws IOException {
@@ -86,7 +87,7 @@ else if (request.getStreamData() != null)
8687
else if (isNonEmpty(request.getFormParams())) {
8788

8889
String contentType = null;
89-
if (!request.getHeaders().containsKey(HttpHeaders.Names.CONTENT_TYPE))
90+
if (!request.getHeaders().containsKey(CONTENT_TYPE))
9091
contentType = HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
9192

9293
nettyBody = new NettyByteBufferBody(urlEncodeFormParams(request.getFormParams(), bodyCharset), contentType);
@@ -114,12 +115,12 @@ else if (request.getBodyGenerator() != null)
114115
public void addAuthorizationHeader(HttpHeaders headers, String authorizationHeader) {
115116
if (authorizationHeader != null)
116117
// don't override authorization but append
117-
headers.add(HttpHeaders.Names.AUTHORIZATION, authorizationHeader);
118+
headers.add(AUTHORIZATION, authorizationHeader);
118119
}
119120

120121
public void setProxyAuthorizationHeader(HttpHeaders headers, String proxyAuthorizationHeader) {
121122
if (proxyAuthorizationHeader != null)
122-
headers.set(HttpHeaders.Names.PROXY_AUTHORIZATION, proxyAuthorizationHeader);
123+
headers.set(PROXY_AUTHORIZATION, proxyAuthorizationHeader);
123124
}
124125

125126
public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConnect, ProxyServer proxyServer) throws IOException {
@@ -160,39 +161,39 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
160161
}
161162

162163
if (isNonEmpty(request.getCookies()))
163-
headers.set(HttpHeaders.Names.COOKIE, CookieEncoder.encode(request.getCookies()));
164+
headers.set(COOKIE, CookieEncoder.encode(request.getCookies()));
164165

165-
if (config.isCompressionEnforced() && !headers.contains(HttpHeaders.Names.ACCEPT_ENCODING))
166-
headers.set(HttpHeaders.Names.ACCEPT_ENCODING, GZIP_DEFLATE);
166+
if (config.isCompressionEnforced() && !headers.contains(ACCEPT_ENCODING))
167+
headers.set(ACCEPT_ENCODING, GZIP_DEFLATE);
167168
}
168169

169170
if (body != null) {
170171
if (body.getContentLength() < 0)
171-
headers.set(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED);
172+
headers.set(TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED);
172173
else
173-
headers.set(HttpHeaders.Names.CONTENT_LENGTH, body.getContentLength());
174+
headers.set(CONTENT_LENGTH, body.getContentLength());
174175

175176
if (body.getContentType() != null)
176-
headers.set(HttpHeaders.Names.CONTENT_TYPE, body.getContentType());
177+
headers.set(CONTENT_TYPE, body.getContentType());
177178
}
178179

179180
// connection header and friends
180181
boolean webSocket = isWebSocket(uri.getScheme());
181182
if (!connect && webSocket) {
182-
headers.set(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET)//
183-
.set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.UPGRADE)//
184-
.set(HttpHeaders.Names.ORIGIN, "http://" + uri.getHost() + ":" + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort()))//
185-
.set(HttpHeaders.Names.SEC_WEBSOCKET_KEY, getKey())//
186-
.set(HttpHeaders.Names.SEC_WEBSOCKET_VERSION, "13");
183+
headers.set(UPGRADE, HttpHeaders.Values.WEBSOCKET)//
184+
.set(CONNECTION, HttpHeaders.Values.UPGRADE)//
185+
.set(ORIGIN, "http://" + uri.getHost() + ":" + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort()))//
186+
.set(SEC_WEBSOCKET_KEY, getKey())//
187+
.set(SEC_WEBSOCKET_VERSION, "13");
187188

188-
} else if (!headers.contains(HttpHeaders.Names.CONNECTION)) {
189+
} else if (!headers.contains(CONNECTION)) {
189190
String connectionHeaderValue = connectionHeader(allowConnectionPooling, httpVersion == HttpVersion.HTTP_1_1);
190191
if (connectionHeaderValue != null)
191-
headers.set(HttpHeaders.Names.CONNECTION, connectionHeaderValue);
192+
headers.set(CONNECTION, connectionHeaderValue);
192193
}
193194

194-
if (!headers.contains(HttpHeaders.Names.HOST))
195-
headers.set(HttpHeaders.Names.HOST, hostHeader(request, uri));
195+
if (!headers.contains(HOST))
196+
headers.set(HOST, hostHeader(request, uri));
196197

197198
Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
198199

@@ -202,12 +203,12 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
202203
setProxyAuthorizationHeader(headers, systematicProxyAuthorizationHeader(request, proxyServer, realm, connect));
203204

204205
// Add default accept headers
205-
if (!headers.contains(HttpHeaders.Names.ACCEPT))
206-
headers.set(HttpHeaders.Names.ACCEPT, "*/*");
206+
if (!headers.contains(ACCEPT))
207+
headers.set(ACCEPT, "*/*");
207208

208209
// Add default user agent
209-
if (!headers.contains(HttpHeaders.Names.USER_AGENT) && config.getUserAgent() != null)
210-
headers.set(HttpHeaders.Names.USER_AGENT, config.getUserAgent());
210+
if (!headers.contains(USER_AGENT) && config.getUserAgent() != null)
211+
headers.set(USER_AGENT, config.getUserAgent());
211212

212213
return nettyRequest;
213214
}

0 commit comments

Comments
 (0)