Skip to content

Commit 159e577

Browse files
author
Stephane Landelle
committed
Minor clean up
1 parent fbdfcb1 commit 159e577

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

api/src/main/java/org/asynchttpclient/filter/ResponseFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* A Filter interface that gets invoked before making the processing of the response bytes. {@link ResponseFilter} are invoked
1717
* before the actual response's status code get processed. That means authorization, proxy authentication and redirects
18-
* processing hasn't occured when {@link ResponseFilter} gets invoked.
18+
* processing hasn't occurred when {@link ResponseFilter} gets invoked.
1919
*/
2020
public interface ResponseFilter {
2121

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyAsyncHttpProvider.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ public class NettyAsyncHttpProvider implements AsyncHttpProvider {
4646
public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
4747

4848
this.config = config;
49-
if (config.getAsyncHttpProviderConfig() instanceof NettyAsyncHttpProviderConfig) {
50-
asyncHttpProviderConfig = NettyAsyncHttpProviderConfig.class.cast(config.getAsyncHttpProviderConfig());
51-
} else {
52-
asyncHttpProviderConfig = new NettyAsyncHttpProviderConfig();
53-
}
49+
asyncHttpProviderConfig = config.getAsyncHttpProviderConfig() instanceof NettyAsyncHttpProviderConfig ? //
50+
NettyAsyncHttpProviderConfig.class.cast(config.getAsyncHttpProviderConfig())
51+
: new NettyAsyncHttpProviderConfig();
5452

5553
channels = new Channels(config, asyncHttpProviderConfig);
5654
requestSender = new NettyRequestSender(closed, config, channels);

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyChannelHandler.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,19 +466,17 @@ private void markAsDone(final NettyResponseFuture<?> future, final ChannelHandle
466466
}
467467
}
468468

469-
private boolean applyResponseFiltersAndReplayRequest(ChannelHandlerContext ctx, NettyResponseFuture future, HttpResponseStatus status, HttpResponseHeaders responseHeaders)
469+
private boolean applyResponseFiltersAndReplayRequest(ChannelHandlerContext ctx, NettyResponseFuture<?> future, HttpResponseStatus status, HttpResponseHeaders responseHeaders)
470470
throws IOException {
471471

472-
boolean replayed = false;
473-
474472
AsyncHandler handler = future.getAsyncHandler();
475473
FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(handler).request(future.getRequest()).responseStatus(status).responseHeaders(responseHeaders)
476474
.build();
477475

478476
for (ResponseFilter asyncFilter : config.getResponseFilters()) {
479477
try {
480478
fc = asyncFilter.filter(fc);
481-
// FIXME Is it work protecting against this?
479+
// FIXME Is it worth protecting against this?
482480
if (fc == null) {
483481
throw new NullPointerException("FilterContext is null");
484482
}
@@ -494,9 +492,9 @@ private boolean applyResponseFiltersAndReplayRequest(ChannelHandlerContext ctx,
494492
// The request has changed
495493
if (fc.replayRequest()) {
496494
requestSender.replayRequest(future, fc, ctx);
497-
replayed = true;
495+
return true;
498496
}
499-
return replayed;
497+
return false;
500498
}
501499

502500
private boolean handleResponseAndExit(final ChannelHandlerContext ctx, final NettyResponseFuture<?> future, AsyncHandler<?> handler, HttpRequest nettyRequest,

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/future/NettyResponseFuture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public V getContent() throws ExecutionException {
258258
currentRetry.set(maxRetry);
259259
if (exEx.get() == null && !contentProcessed.getAndSet(true)) {
260260
try {
261-
update = (V) asyncHandler.onCompleted();
261+
update = asyncHandler.onCompleted();
262262
} catch (Throwable ex) {
263263
if (!throwableCalled.getAndSet(true)) {
264264
try {

0 commit comments

Comments
 (0)