Introduce Interceptors

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/handler/AsyncHttpClientHandler.java

@@ -13,17 +13,13 @@
  */
 package org.asynchttpclient.netty.handler;
 
-import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.*;
 import static org.asynchttpclient.util.MiscUtils.getCause;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.PrematureChannelClosureException;
 import io.netty.handler.codec.http.HttpContent;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.util.ReferenceCountUtil;
 
@@ -32,17 +28,15 @@
 
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.HttpResponseBodyPart;
-import org.asynchttpclient.Realm;
-import org.asynchttpclient.Request;
 import org.asynchttpclient.exception.ChannelClosedException;
 import org.asynchttpclient.netty.Callback;
 import org.asynchttpclient.netty.DiscardEvent;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.channel.ChannelManager;
 import org.asynchttpclient.netty.channel.Channels;
 import org.asynchttpclient.netty.future.StackTraceInspector;
+import org.asynchttpclient.netty.handler.intercept.Interceptors;
 import org.asynchttpclient.netty.request.NettyRequestSender;
-import org.asynchttpclient.proxy.ProxyServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,12 +47,7 @@ public abstract class AsyncHttpClientHandler extends ChannelInboundHandlerAdapte
  protected final AsyncHttpClientConfig config;
  protected final ChannelManager channelManager;
  protected final NettyRequestSender requestSender;
- private final Unauthorized401Handler unauthorized401Handler;
- private final ProxyUnauthorized407Handler proxyUnauthorized407Handler;
- private final Continue100Handler continue100Handler;
- private final Redirect30xHandler redirect30xHandler;
- private final ConnectSuccessHandler connectSuccessHandler;
- protected final ResponseFiltersHandler responseFiltersHandler;
+ protected final Interceptors interceptors;
  protected final boolean hasIOExceptionFilters;
 
  public AsyncHttpClientHandler(AsyncHttpClientConfig config,//
@@ -67,12 +56,7 @@ public AsyncHttpClientHandler(AsyncHttpClientConfig config,//
  this.config = config;
  this.channelManager = channelManager;
  this.requestSender = requestSender;
- unauthorized401Handler = new Unauthorized401Handler(channelManager, requestSender);
- proxyUnauthorized407Handler = new ProxyUnauthorized407Handler(channelManager, requestSender);
- continue100Handler = new Continue100Handler(requestSender);
- redirect30xHandler = new Redirect30xHandler(channelManager, config, requestSender);
- connectSuccessHandler = new ConnectSuccessHandler(channelManager, requestSender);
- responseFiltersHandler = new ResponseFiltersHandler(config, requestSender);
+ interceptors = new Interceptors(config, channelManager, requestSender);
  hasIOExceptionFilters = !config.getIoExceptionFilters().isEmpty();
  }
 
@@ -258,31 +242,4 @@ private boolean isHandledByReactiveStreams(ChannelHandlerContext ctx) {
  public abstract void handleException(NettyResponseFuture<?> future, Throwable error);
 
  public abstract void handleChannelInactive(NettyResponseFuture<?> future);
-
- protected boolean exitAfterSpecialCases(final HttpResponse response, final Channel channel, final NettyResponseFuture<?> future) throws Exception {
-
- HttpRequest httpRequest = future.getNettyRequest().getHttpRequest();
- ProxyServer proxyServer = future.getProxyServer();
- int statusCode = response.getStatus().code();
- Request request = future.getCurrentRequest();
- Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
-
- if (statusCode == UNAUTHORIZED_401) {
- return unauthorized401Handler.exitAfterHandling401(channel, future, response, request, statusCode, realm, proxyServer, httpRequest);
-
- } else if (statusCode == PROXY_AUTHENTICATION_REQUIRED_407) {
- return proxyUnauthorized407Handler.exitAfterHandling407(channel, future, response, request, statusCode, proxyServer, httpRequest);
-
- } else if (statusCode == CONTINUE_100) {
- return continue100Handler.exitAfterHandling100(channel, future, statusCode);
-
- } else if (Redirect30xHandler.REDIRECT_STATUSES.contains(statusCode)) {
- return redirect30xHandler.exitAfterHandlingRedirect(channel, future, response, request, statusCode, realm);
-
- } else if (httpRequest.getMethod() == HttpMethod.CONNECT && statusCode == OK_200) {
- return connectSuccessHandler.exitAfterHandlingConnect(channel, future, request, proxyServer, statusCode, httpRequest);
-
- }
- return false;
- }
 }

client/src/main/java/org/asynchttpclient/netty/handler/HttpHandler.java

@@ -128,9 +128,8 @@ private boolean handleHttpResponse(final HttpResponse response, final Channel ch
  NettyResponseStatus status = new NettyResponseStatus(future.getUri(), config, response, channel);
  HttpResponseHeaders responseHeaders = new HttpResponseHeaders(response.headers());
 
- return responseFiltersHandler.exitAfterProcessingFilters(channel, future, handler, status, responseHeaders) || //
- exitAfterSpecialCases(response, channel, future) || //
- exitAfterHandler(channel, future, response, handler, status, httpRequest, responseHeaders);
+ return interceptors.intercept(channel, future, handler, response, status, responseHeaders)
+ || exitAfterHandler(channel, future, response, handler, status, httpRequest, responseHeaders);
  }
 
  private void handleChunk(HttpContent chunk,//

client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java

@@ -140,8 +140,7 @@ public void handleRead(Channel channel, NettyResponseFuture<?> future, Object e)
  HttpResponseStatus status = new NettyResponseStatus(future.getUri(), config, response, channel);
  HttpResponseHeaders responseHeaders = new HttpResponseHeaders(response.headers());
 
- if (responseFiltersHandler.exitAfterProcessingFilters(channel, future, handler, status, responseHeaders) || //
- exitAfterSpecialCases(response, channel, future)) {
+ if (interceptors.intercept(channel, future, handler, response, status, responseHeaders)) {
  return;
  }
 

client/src/main/java/org/asynchttpclient/netty/handler/ConnectSuccessHandler.java renamed to client/src/main/java/org/asynchttpclient/netty/handler/intercept/ConnectSuccessInterceptor.java

@@ -11,7 +11,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.netty.handler;
+package org.asynchttpclient.netty.handler.intercept;
 
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.HttpRequest;
@@ -28,14 +28,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ConnectSuccessHandler {
+public class ConnectSuccessInterceptor {
 
- private static final Logger LOGGER = LoggerFactory.getLogger(ConnectSuccessHandler.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConnectSuccessInterceptor.class);
 
  private final ChannelManager channelManager;
  private final NettyRequestSender requestSender;
 
- public ConnectSuccessHandler(ChannelManager channelManager, NettyRequestSender requestSender) {
+ public ConnectSuccessInterceptor(ChannelManager channelManager, NettyRequestSender requestSender) {
  this.channelManager = channelManager;
  this.requestSender = requestSender;
  }

client/src/main/java/org/asynchttpclient/netty/handler/Continue100Handler.java renamed to client/src/main/java/org/asynchttpclient/netty/handler/intercept/Continue100Interceptor.java

@@ -11,7 +11,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.netty.handler;
+package org.asynchttpclient.netty.handler.intercept;
 
 import io.netty.channel.Channel;
 
@@ -22,11 +22,11 @@
 import org.asynchttpclient.netty.channel.Channels;
 import org.asynchttpclient.netty.request.NettyRequestSender;
 
-public class Continue100Handler {
+public class Continue100Interceptor {
 
  private final NettyRequestSender requestSender;
 
- public Continue100Handler(NettyRequestSender requestSender) {
+ public Continue100Interceptor(NettyRequestSender requestSender) {
  this.requestSender = requestSender;
  }
 

client/src/main/java/org/asynchttpclient/netty/handler/intercept/Interceptors.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2015 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package org.asynchttpclient.netty.handler.intercept;
+
+import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.*;
+import io.netty.channel.Channel;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+
+import org.asynchttpclient.AsyncHandler;
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.HttpResponseHeaders;
+import org.asynchttpclient.HttpResponseStatus;
+import org.asynchttpclient.Realm;
+import org.asynchttpclient.Request;
+import org.asynchttpclient.netty.NettyResponseFuture;
+import org.asynchttpclient.netty.channel.ChannelManager;
+import org.asynchttpclient.netty.request.NettyRequestSender;
+import org.asynchttpclient.proxy.ProxyServer;
+
+public class Interceptors {
+
+ private final AsyncHttpClientConfig config;
+ private final Unauthorized401Interceptor unauthorized401Interceptor;
+ private final ProxyUnauthorized407Interceptor proxyUnauthorized407Interceptor;
+ private final Continue100Interceptor continue100Interceptor;
+ private final Redirect30xInterceptor redirect30xInterceptor;
+ private final ConnectSuccessInterceptor connectSuccessInterceptor;
+ private final ResponseFiltersInterceptor responseFiltersInterceptor;
+ private final boolean hasResponseFilters;
+
+ public Interceptors(//
+ AsyncHttpClientConfig config,//
+ ChannelManager channelManager,//
+ NettyRequestSender requestSender) {
+ this.config = config;
+ unauthorized401Interceptor = new Unauthorized401Interceptor(channelManager, requestSender);
+ proxyUnauthorized407Interceptor = new ProxyUnauthorized407Interceptor(channelManager, requestSender);
+ continue100Interceptor = new Continue100Interceptor(requestSender);
+ redirect30xInterceptor = new Redirect30xInterceptor(channelManager, config, requestSender);
+ connectSuccessInterceptor = new ConnectSuccessInterceptor(channelManager, requestSender);
+ responseFiltersInterceptor = new ResponseFiltersInterceptor(config, requestSender);
+ hasResponseFilters = !config.getResponseFilters().isEmpty();
+ }
+
+ public boolean intercept(//
+ Channel channel,//
+ NettyResponseFuture<?> future,//
+ AsyncHandler<?> handler,//
+ HttpResponse response,//
+ HttpResponseStatus status,//
+ HttpResponseHeaders responseHeaders) throws Exception {
+
+ HttpRequest httpRequest = future.getNettyRequest().getHttpRequest();
+ ProxyServer proxyServer = future.getProxyServer();
+ int statusCode = response.getStatus().code();
+ Request request = future.getCurrentRequest();
+ Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
+
+ if (hasResponseFilters && responseFiltersInterceptor.exitAfterProcessingFilters(channel, future, handler, status, responseHeaders)) {
+ return true;
+ }
+
+ if (statusCode == UNAUTHORIZED_401) {
+ return unauthorized401Interceptor.exitAfterHandling401(channel, future, response, request, statusCode, realm, proxyServer, httpRequest);
+
+ } else if (statusCode == PROXY_AUTHENTICATION_REQUIRED_407) {
+ return proxyUnauthorized407Interceptor.exitAfterHandling407(channel, future, response, request, statusCode, proxyServer, httpRequest);
+
+ } else if (statusCode == CONTINUE_100) {
+ return continue100Interceptor.exitAfterHandling100(channel, future, statusCode);
+
+ } else if (Redirect30xInterceptor.REDIRECT_STATUSES.contains(statusCode)) {
+ return redirect30xInterceptor.exitAfterHandlingRedirect(channel, future, response, request, statusCode, realm);
+
+ } else if (httpRequest.getMethod() == HttpMethod.CONNECT && statusCode == OK_200) {
+ return connectSuccessInterceptor.exitAfterHandlingConnect(channel, future, request, proxyServer, statusCode, httpRequest);
+
+ }
+ return false;
+ }
+}

client/src/main/java/org/asynchttpclient/netty/handler/ProxyUnauthorized407Handler.java renamed to client/src/main/java/org/asynchttpclient/netty/handler/intercept/ProxyUnauthorized407Interceptor.java

@@ -11,7 +11,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.netty.handler;
+package org.asynchttpclient.netty.handler.intercept;
 
 import static org.asynchttpclient.Dsl.realm;
 import static org.asynchttpclient.util.AuthenticatorUtils.getHeaderWithPrefix;
@@ -39,14 +39,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ProxyUnauthorized407Handler {
+public class ProxyUnauthorized407Interceptor {
 
- private static final Logger LOGGER = LoggerFactory.getLogger(ProxyUnauthorized407Handler.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ProxyUnauthorized407Interceptor.class);
 
  private final ChannelManager channelManager;
  private final NettyRequestSender requestSender;
 
- public ProxyUnauthorized407Handler(ChannelManager channelManager, NettyRequestSender requestSender) {
+ public ProxyUnauthorized407Interceptor(ChannelManager channelManager, NettyRequestSender requestSender) {
  this.channelManager = channelManager;
  this.requestSender = requestSender;
  }

client/src/main/java/org/asynchttpclient/netty/handler/Redirect30xHandler.java renamed to client/src/main/java/org/asynchttpclient/netty/handler/intercept/Redirect30xInterceptor.java

@@ -11,7 +11,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.netty.handler;
+package org.asynchttpclient.netty.handler.intercept;
 
 import static io.netty.handler.codec.http.HttpHeaders.Names.*;
 import static org.asynchttpclient.util.HttpConstants.Methods.GET;
@@ -41,7 +41,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Redirect30xHandler {
+public class Redirect30xInterceptor {
 
  public static final Set<Integer> REDIRECT_STATUSES = new HashSet<>();
  static {
@@ -51,21 +51,21 @@ public class Redirect30xHandler {
  REDIRECT_STATUSES.add(TEMPORARY_REDIRECT_307);
  }
 
- private static final Logger LOGGER = LoggerFactory.getLogger(Redirect30xHandler.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Redirect30xInterceptor.class);
 
  private final ChannelManager channelManager;
  private final AsyncHttpClientConfig config;
  private final NettyRequestSender requestSender;
  private final MaxRedirectException maxRedirectException;
 
- public Redirect30xHandler(ChannelManager channelManager, AsyncHttpClientConfig config, NettyRequestSender requestSender) {
+ public Redirect30xInterceptor(ChannelManager channelManager, AsyncHttpClientConfig config, NettyRequestSender requestSender) {
  this.channelManager = channelManager;
  this.config = config;
  this.requestSender = requestSender;
  maxRedirectException = new MaxRedirectException("Maximum redirect reached: " + config.getMaxRedirects());
  }
 
- protected boolean exitAfterHandlingRedirect(//
+ public boolean exitAfterHandlingRedirect(//
  Channel channel,//
  NettyResponseFuture<?> future,//
  HttpResponse response,//