Skip to content

Commit 86da45c

Browse files
slandelleslandelle
committed
Introduce more convenient constants than Netty's
1 parent e501565 commit 86da45c

File tree

6 files changed

+71
-28
lines changed

6 files changed

+71
-28
lines changed

‎client/src/main/java/org/asynchttpclient/Dsl.java

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

16-
import io.netty.handler.codec.http.HttpMethod;
16+
import static org.asynchttpclient.util.HttpConstants.Methods.*;
1717

1818
import org.asynchttpclient.Realm.AuthScheme;
1919
import org.asynchttpclient.proxy.ProxyServer;
@@ -35,35 +35,35 @@ public static AsyncHttpClient asyncHttpClient(AsyncHttpClientConfig config) {
3535

3636
// /////////// Request ////////////////
3737
public static RequestBuilder get(String url) {
38-
return request(HttpMethod.GET.name(), url);
38+
return request(GET, url);
3939
}
4040

4141
public static RequestBuilder put(String url) {
42-
return request(HttpMethod.PUT.name(), url);
42+
return request(PUT, url);
4343
}
4444

4545
public static RequestBuilder post(String url) {
46-
return request(HttpMethod.POST.name(), url);
46+
return request(POST, url);
4747
}
4848

4949
public static RequestBuilder delete(String url) {
50-
return request(HttpMethod.DELETE.name(), url);
50+
return request(DELETE, url);
5151
}
5252

5353
public static RequestBuilder head(String url) {
54-
return request(HttpMethod.HEAD.name(), url);
54+
return request(HEAD, url);
5555
}
5656

5757
public static RequestBuilder options(String url) {
58-
return request(HttpMethod.OPTIONS.name(), url);
58+
return request(OPTIONS, url);
5959
}
6060

6161
public static RequestBuilder path(String url) {
62-
return request(HttpMethod.PATCH.name(), url);
62+
return request(PATCH, url);
6363
}
6464

6565
public static RequestBuilder trace(String url) {
66-
return request(HttpMethod.TRACE.name(), url);
66+
return request(TRACE, url);
6767
}
6868

6969
public static RequestBuilder request(String method, String url) {

‎client/src/main/java/org/asynchttpclient/RequestBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.asynchttpclient;
1717

18-
import io.netty.handler.codec.http.HttpMethod;
18+
import static org.asynchttpclient.util.HttpConstants.Methods.GET;
1919

2020
/**
2121
* Builder for a {@link Request}. Warning: mutable and not thread-safe! Beware that it holds a reference on the Request instance it builds, so modifying the builder will modify the
@@ -24,7 +24,7 @@
2424
public class RequestBuilder extends RequestBuilderBase<RequestBuilder> {
2525

2626
public RequestBuilder() {
27-
this(HttpMethod.GET.name());
27+
this(GET);
2828
}
2929

3030
public RequestBuilder(String method) {

‎client/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java

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

16-
import static io.netty.handler.codec.http.HttpResponseStatus.*;
1716
import static org.asynchttpclient.Dsl.realm;
17+
import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.*;
1818
import static org.asynchttpclient.util.AuthenticatorUtils.getHeaderWithPrefix;
19+
import static org.asynchttpclient.util.HttpConstants.Methods.*;
1920
import io.netty.buffer.ByteBuf;
2021
import io.netty.channel.Channel;
2122
import io.netty.handler.codec.http.DefaultHttpHeaders;
@@ -413,7 +414,7 @@ private boolean exitAfterHandling407(//
413414

414415
RequestBuilder nextRequestBuilder = new RequestBuilder(future.getCurrentRequest()).setHeaders(requestHeaders);
415416
if (future.getCurrentRequest().getUri().isSecured()) {
416-
nextRequestBuilder.setMethod(HttpMethod.CONNECT.name());
417+
nextRequestBuilder.setMethod(CONNECT);
417418
}
418419
final Request nextRequest = nextRequestBuilder.build();
419420

@@ -497,19 +498,19 @@ private boolean exitAfterSpecialCases(final HttpResponse response, final Channel
497498
Request request = future.getCurrentRequest();
498499
Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
499500

500-
if (statusCode == UNAUTHORIZED.code()) {
501+
if (statusCode == UNAUTHORIZED_401) {
501502
return exitAfterHandling401(channel, future, response, request, statusCode, realm, proxyServer, httpRequest);
502503

503-
} else if (statusCode == PROXY_AUTHENTICATION_REQUIRED.code()) {
504+
} else if (statusCode == PROXY_AUTHENTICATION_REQUIRED_407) {
504505
return exitAfterHandling407(channel, future, response, request, statusCode, proxyServer, httpRequest);
505506

506-
} else if (statusCode == CONTINUE.code()) {
507+
} else if (statusCode == CONTINUE_100) {
507508
return exitAfterHandling100(channel, future, statusCode);
508509

509510
} else if (REDIRECT_STATUSES.contains(statusCode)) {
510511
return exitAfterHandlingRedirect(channel, future, response, request, statusCode, realm);
511512

512-
} else if (httpRequest.getMethod() == HttpMethod.CONNECT && statusCode == OK.code()) {
513+
} else if (httpRequest.getMethod() == HttpMethod.CONNECT && statusCode == OK_200) {
513514
return exitAfterHandlingConnect(channel, future, request, proxyServer, statusCode, httpRequest);
514515

515516
}

‎client/src/main/java/org/asynchttpclient/netty/handler/Protocol.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
package org.asynchttpclient.netty.handler;
1515

1616
import static io.netty.handler.codec.http.HttpHeaders.Names.*;
17-
import static io.netty.handler.codec.http.HttpResponseStatus.*;
1817
import static org.asynchttpclient.util.Assertions.assertNotNull;
18+
import static org.asynchttpclient.util.HttpConstants.Methods.*;
19+
import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.*;
1920
import static org.asynchttpclient.util.HttpUtils.*;
2021
import io.netty.channel.Channel;
2122
import io.netty.handler.codec.http.HttpHeaders;
22-
import io.netty.handler.codec.http.HttpMethod;
2323
import io.netty.handler.codec.http.HttpResponse;
2424

2525
import java.util.HashSet;
@@ -61,10 +61,10 @@ public abstract class Protocol {
6161

6262
public static final Set<Integer> REDIRECT_STATUSES = new HashSet<>();
6363
static {
64-
REDIRECT_STATUSES.add(MOVED_PERMANENTLY.code());
65-
REDIRECT_STATUSES.add(FOUND.code());
66-
REDIRECT_STATUSES.add(SEE_OTHER.code());
67-
REDIRECT_STATUSES.add(TEMPORARY_REDIRECT.code());
64+
REDIRECT_STATUSES.add(MOVED_PERMANENTLY_301);
65+
REDIRECT_STATUSES.add(FOUND_302);
66+
REDIRECT_STATUSES.add(SEE_OTHER_303);
67+
REDIRECT_STATUSES.add(TEMPORARY_REDIRECT_307);
6868
}
6969

7070
public Protocol(ChannelManager channelManager, AsyncHttpClientConfig config, NettyRequestSender requestSender) {
@@ -118,10 +118,10 @@ protected boolean exitAfterHandlingRedirect(//
118118
future.getInProxyAuth().set(false);
119119

120120
String originalMethod = request.getMethod();
121-
boolean switchToGet = !originalMethod.equals(HttpMethod.GET.name()) && (statusCode == 301 || statusCode == 303 || (statusCode == 302 && !config.isStrict302Handling()));
122-
boolean keepBody = statusCode == 307 || (statusCode == 302 && config.isStrict302Handling());
121+
boolean switchToGet = !originalMethod.equals(GET) && (statusCode == MOVED_PERMANENTLY_301 || statusCode == SEE_OTHER_303 || (statusCode == FOUND_302 && !config.isStrict302Handling()));
122+
boolean keepBody = statusCode == TEMPORARY_REDIRECT_307 || (statusCode == FOUND_302 && config.isStrict302Handling());
123123

124-
final RequestBuilder requestBuilder = new RequestBuilder(switchToGet ? HttpMethod.GET.name() : originalMethod)//
124+
final RequestBuilder requestBuilder = new RequestBuilder(switchToGet ? GET : originalMethod)//
125125
.setCookies(request.getCookies())//
126126
.setConnectionPoolPartitioning(request.getConnectionPoolPartitioning())//
127127
.setFollowRedirect(true)//

‎client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import static org.asynchttpclient.util.Assertions.assertNotNull;
1717
import static org.asynchttpclient.util.AuthenticatorUtils.*;
18+
import static org.asynchttpclient.util.HttpConstants.Methods.*;
1819
import static org.asynchttpclient.util.HttpUtils.requestTimeout;
1920
import static org.asynchttpclient.util.MiscUtils.getCause;
2021
import static org.asynchttpclient.util.ProxyUtils.getProxyServer;
@@ -113,7 +114,7 @@ private boolean isConnectDone(Request request, NettyResponseFuture<?> future) {
113114
return future != null //
114115
&& future.getNettyRequest() != null //
115116
&& future.getNettyRequest().getHttpRequest().getMethod() == HttpMethod.CONNECT //
116-
&& !request.getMethod().equals(HttpMethod.CONNECT.name());
117+
&& !request.getMethod().equals(CONNECT);
117118
}
118119

119120
/**
@@ -453,7 +454,7 @@ private void validateWebSocketRequest(Request request, AsyncHandler<?> asyncHand
453454
if (asyncHandler instanceof WebSocketUpgradeHandler) {
454455
if (!isWs)
455456
throw new IllegalArgumentException("WebSocketUpgradeHandler but scheme isn't ws or wss: " + uri.getScheme());
456-
else if (!request.getMethod().equals(HttpMethod.GET.name()))
457+
else if (!request.getMethod().equals(GET))
457458
throw new IllegalArgumentException("WebSocketUpgradeHandler but method isn't GET: " + request.getMethod());
458459
} else if (isWs) {
459460
throw new IllegalArgumentException("No WebSocketUpgradeHandler but scheme is " + uri.getScheme());

‎client/src/main/java/org/asynchttpclient/util/HttpConstants.java

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package org.asynchttpclient.util;
2+
3+
import io.netty.handler.codec.http.HttpMethod;
4+
import io.netty.handler.codec.http.HttpResponseStatus;
5+
6+
public final class HttpConstants {
7+
8+
public static final class Methods {
9+
public static final String CONNECT = HttpMethod.CONNECT.name();
10+
public static final String DELETE = HttpMethod.DELETE.name();
11+
public static final String GET = HttpMethod.GET.name();
12+
public static final String HEAD = HttpMethod.HEAD.name();
13+
public static final String OPTIONS = HttpMethod.OPTIONS.name();
14+
public static final String PATCH = HttpMethod.PATCH.name();
15+
public static final String POST = HttpMethod.POST.name();
16+
public static final String PUT = HttpMethod.PUT.name();
17+
public static final String TRACE = HttpMethod.TRACE.name();
18+
19+
private Methods() {
20+
}
21+
}
22+
23+
public static final class ResponseStatusCodes {
24+
public static final int CONTINUE_100 = HttpResponseStatus.CONTINUE.code();
25+
public static final int SWITCHING_PROTOCOLS_101 = HttpResponseStatus.SWITCHING_PROTOCOLS.code();
26+
public static final int OK_200 = HttpResponseStatus.OK.code();
27+
public static final int MOVED_PERMANENTLY_301 = HttpResponseStatus.MOVED_PERMANENTLY.code();
28+
public static final int FOUND_302 = HttpResponseStatus.FOUND.code();
29+
public static final int SEE_OTHER_303 = HttpResponseStatus.SEE_OTHER.code();
30+
public static final int NOT_MODIFIED_304 = HttpResponseStatus.NOT_MODIFIED.code();
31+
public static final int TEMPORARY_REDIRECT_307 = HttpResponseStatus.TEMPORARY_REDIRECT.code();
32+
public static final int UNAUTHORIZED_401 = HttpResponseStatus.UNAUTHORIZED.code();
33+
public static final int PROXY_AUTHENTICATION_REQUIRED_407 = HttpResponseStatus.PROXY_AUTHENTICATION_REQUIRED.code();
34+
35+
private ResponseStatusCodes() {
36+
}
37+
}
38+
39+
private HttpConstants() {
40+
}
41+
}

0 commit comments

Comments
 (0)