Suffix extensions with Attempt

AsyncHttpClient · Nov 30, 2015 · 51653d8 · 51653d8
1 parent c6500ad
commit 51653d8
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/client/src/main/java/org/asynchttpclient/Realm.java b/client/src/main/java/org/asynchttpclient/Realm.java
@@ -101,7 +101,6 @@ public String getPassword() {
     }
 
     public AuthScheme getScheme() {
-
         return scheme;
     }
 

diff --git a/client/src/main/java/org/asynchttpclient/handler/AsyncHandlerExtensions.java b/client/src/main/java/org/asynchttpclient/handler/AsyncHandlerExtensions.java
@@ -60,7 +60,7 @@ public interface AsyncHandlerExtensions {
      * 
      * @param remoteAddress the address we try to connect to
      */
-    void onTcpConnect(InetSocketAddress remoteAddress);
+    void onTcpConnectAttempt(InetSocketAddress remoteAddress);
 
     /**
      * Notify the callback after a successful connect
@@ -85,7 +85,7 @@ public interface AsyncHandlerExtensions {
     /**
      * Notify the callback before TLS handshake
      */
-    void onTlsHandshake();
+    void onTlsHandshakeAttempt();
 
     /**
      * Notify the callback after the TLS was successful
@@ -104,7 +104,7 @@ public interface AsyncHandlerExtensions {
     /**
      * Notify the callback when trying to fetch a connection from the pool.
      */
-    void onConnectionPool();
+    void onConnectionPoolAttempt();
 
     /**
      * Notify the callback when a new connection was successfully fetched from the pool.

diff --git a/client/src/main/java/org/asynchttpclient/handler/ExtendedAsyncHandler.java b/client/src/main/java/org/asynchttpclient/handler/ExtendedAsyncHandler.java
@@ -36,7 +36,7 @@ public void onHostnameResolutionFailure(String name, Throwable cause) {
     }
 
     @Override
-    public void onTcpConnect(InetSocketAddress address) {
+    public void onTcpConnectAttempt(InetSocketAddress address) {
     }
 
     @Override
@@ -48,7 +48,7 @@ public void onTcpConnectFailure(InetSocketAddress remoteAddress, Throwable cause
     }
 
     @Override
-    public void onTlsHandshake() {
+    public void onTlsHandshakeAttempt() {
     }
 
     @Override
@@ -60,7 +60,7 @@ public void onTlsHandshakeFailure(Throwable cause) {
     }
 
     @Override
-    public void onConnectionPool() {
+    public void onConnectionPoolAttempt() {
     }
 
     @Override

diff --git a/client/src/main/java/org/asynchttpclient/netty/channel/NettyConnectListener.java b/client/src/main/java/org/asynchttpclient/netty/channel/NettyConnectListener.java
@@ -90,7 +90,7 @@ public void onSuccess(Channel channel) throws Exception {
             final AsyncHandlerExtensions asyncHandlerExtensions = toAsyncHandlerExtensions(future.getAsyncHandler());
 
             if (asyncHandlerExtensions != null)
-                asyncHandlerExtensions.onTlsHandshake();
+                asyncHandlerExtensions.onTlsHandshakeAttempt();
 
             sslHandler.handshakeFuture().addListener(new SimpleGenericFutureListener<Channel>() {
 

diff --git a/client/src/main/java/org/asynchttpclient/netty/request/NettyChannelConnector.java b/client/src/main/java/org/asynchttpclient/netty/request/NettyChannelConnector.java
@@ -48,7 +48,7 @@ public void connect(final Bootstrap bootstrap, final NettyConnectListener<?> con
         final InetSocketAddress remoteAddress = remoteAddresses.get(i);
 
         if (asyncHandlerExtensions != null)
-            asyncHandlerExtensions.onTcpConnect(remoteAddress);
+            asyncHandlerExtensions.onTcpConnectAttempt(remoteAddress);
 
         final ChannelFuture future = localAddress != null ? bootstrap.connect(remoteAddress, localAddress) : bootstrap.connect(remoteAddress);
 

diff --git a/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java b/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java
@@ -470,7 +470,7 @@ else if (!request.getMethod().equals(GET))
     private Channel pollPooledChannel(Request request, ProxyServer proxy, AsyncHandler<?> asyncHandler) {
 
         if (asyncHandler instanceof AsyncHandlerExtensions)
-            AsyncHandlerExtensions.class.cast(asyncHandler).onConnectionPool();
+            AsyncHandlerExtensions.class.cast(asyncHandler).onConnectionPoolAttempt();
 
         Uri uri = request.getUri();
         String virtualHost = request.getVirtualHost();

diff --git a/client/src/main/java/org/asynchttpclient/netty/ssl/JsseSslEngineFactory.java b/client/src/main/java/org/asynchttpclient/netty/ssl/JsseSslEngineFactory.java
@@ -32,5 +32,4 @@ public SSLEngine newSslEngine(AsyncHttpClientConfig config, String peerHost, int
         configureSslEngine(sslEngine, config);
         return sslEngine;
     }
-
 }
diff --git a/client/src/test/java/org/asynchttpclient/netty/handler/NettyReactiveStreamsTest.java b/client/src/test/java/org/asynchttpclient/netty/handler/NettyReactiveStreamsTest.java
@@ -133,19 +133,19 @@ public void onHostnameResolutionSuccess(String name, List<InetSocketAddress> add
         @Override
         public void onHostnameResolutionFailure(String name, Throwable cause) {}
         @Override
-        public void onTcpConnect(InetSocketAddress address) {}
+        public void onTcpConnectAttempt(InetSocketAddress address) {}
         @Override
         public void onTcpConnectSuccess(InetSocketAddress address, Channel connection) {}
         @Override
         public void onTcpConnectFailure(InetSocketAddress address, Throwable cause) {}
         @Override
-        public void onTlsHandshake() {}
+        public void onTlsHandshakeAttempt() {}
         @Override
         public void onTlsHandshakeSuccess() {}
         @Override
         public void onTlsHandshakeFailure(Throwable cause) {}
         @Override
-        public void onConnectionPool() {}
+        public void onConnectionPoolAttempt() {}
         @Override
         public void onConnectionPooled(Channel connection) {}
         @Override

diff --git a/client/src/test/java/org/asynchttpclient/test/EventCollectingHandler.java b/client/src/test/java/org/asynchttpclient/test/EventCollectingHandler.java
@@ -95,7 +95,7 @@ public State onContentWritten() {
     }
 
     @Override
-    public void onTcpConnect(InetSocketAddress address) {
+    public void onTcpConnectAttempt(InetSocketAddress address) {
         firedEvents.add(CONNECTION_OPEN_EVENT);
     }
 
@@ -125,7 +125,7 @@ public void onHostnameResolutionFailure(String name, Throwable cause) {
     }
 
     @Override
-    public void onTlsHandshake() {
+    public void onTlsHandshakeAttempt() {
         firedEvents.add(TLS_HANDSHAKE_EVENT);
     }
 
@@ -140,7 +140,7 @@ public void onTlsHandshakeFailure(Throwable cause) {
     }
 
     @Override
-    public void onConnectionPool() {
+    public void onConnectionPoolAttempt() {
         firedEvents.add(CONNECTION_POOL_EVENT);
     }