Missing @Override annotations

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpasyncclient/trunk@1630965 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidationRequest.java b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidationRequest.java
index b6e4872..71933d8 100644
--- a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidationRequest.java
+++ b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidationRequest.java
@@ -70,16 +70,20 @@
         this.identifier = identifier;
     }
 
+    @Override
     public void run() {
         try {
             final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
 
+                @Override
                 public void cancelled() {
                 }
 
+                @Override
                 public void completed(final HttpResponse httpResponse) {
                 }
 
+                @Override
                 public void failed(final Exception e) {
                     log.debug("Asynchronous revalidation failed", e);
                 }
diff --git a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
index 87a1695..22e9d96 100644
--- a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
+++ b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
@@ -237,6 +237,7 @@
         return this.cacheUpdates.get();
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpHost target,
             final HttpRequest request,
@@ -244,6 +245,7 @@
         return execute(target, request, null, callback);
     }
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
@@ -251,6 +253,7 @@
         return execute(requestProducer, responseConsumer, null, callback);
     }
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
@@ -260,12 +263,14 @@
         return this.backend.execute(requestProducer, responseConsumer, context, callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpUriRequest request,
             final FutureCallback<HttpResponse> callback) {
         return execute(request, null, callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpUriRequest request,
             final HttpContext context,
@@ -275,6 +280,7 @@
         return execute(httpHost, request, context, callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpHost target,
             final HttpRequest originalRequest,
diff --git a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/ChainedFutureCallback.java b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/ChainedFutureCallback.java
index 11b9b8b..b813b11 100644
--- a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/ChainedFutureCallback.java
+++ b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/ChainedFutureCallback.java
@@ -37,14 +37,17 @@
         this.wrapped = delegate;
     }
 
+    @Override
     public void completed(final T result) {
         this.wrapped.completed(result);
     }
 
+    @Override
     public void failed(final Exception ex) {
         this.wrapped.failed(ex);
     }
 
+    @Override
     public void cancelled() {
         this.wrapped.cancel();
     }
diff --git a/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/CachingHttpAsyncClientExecChain.java b/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/CachingHttpAsyncClientExecChain.java
index a04672c..145ad57 100644
--- a/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/CachingHttpAsyncClientExecChain.java
+++ b/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/CachingHttpAsyncClientExecChain.java
@@ -91,6 +91,7 @@
         return execute(route, request, context, null);
     }
 
+    @Override
     public CloseableHttpResponse execute(
             final HttpRoute route,
             final HttpRequestWrapper request,
diff --git a/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/ClientExecChainAsyncClient.java b/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/ClientExecChainAsyncClient.java
index e37be4e..adb9041 100644
--- a/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/ClientExecChainAsyncClient.java
+++ b/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/ClientExecChainAsyncClient.java
@@ -84,10 +84,12 @@
         return null;
     }
 
+    @Override
     public void close() throws IOException {
         // no-op
     }
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
diff --git a/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientEvictExpiredConnections.java b/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientEvictExpiredConnections.java
index 7554fdd..95adf13 100644
--- a/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientEvictExpiredConnections.java
+++ b/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientEvictExpiredConnections.java
@@ -70,16 +70,19 @@
                 final HttpGet httpget = new HttpGet(uri);
                 httpclient.execute(httpget, new FutureCallback<HttpResponse>() {
 
+                    @Override
                     public void completed(final HttpResponse response) {
                         latch.countDown();
                         System.out.println(httpget.getRequestLine() + "->" + response.getStatusLine());
                     }
 
+                    @Override
                     public void failed(final Exception ex) {
                         latch.countDown();
                         System.out.println(httpget.getRequestLine() + "->" + ex);
                     }
 
+                    @Override
                     public void cancelled() {
                         latch.countDown();
                         System.out.println(httpget.getRequestLine() + " cancelled");
diff --git a/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeFutureCallback.java b/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeFutureCallback.java
index e407e46..2693608 100644
--- a/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeFutureCallback.java
+++ b/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeFutureCallback.java
@@ -59,16 +59,19 @@
             for (final HttpGet request: requests) {
                 httpclient.execute(request, new FutureCallback<HttpResponse>() {
 
+                    @Override
                     public void completed(final HttpResponse response) {
                         latch.countDown();
                         System.out.println(request.getRequestLine() + "->" + response.getStatusLine());
                     }
 
+                    @Override
                     public void failed(final Exception ex) {
                         latch.countDown();
                         System.out.println(request.getRequestLine() + "->" + ex);
                     }
 
+                    @Override
                     public void cancelled() {
                         latch.countDown();
                         System.out.println(request.getRequestLine() + " cancelled");
diff --git a/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java b/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java
index 90ec987..73a8771 100644
--- a/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java
+++ b/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java
@@ -62,16 +62,19 @@
             final HttpGet request2 = new HttpGet("http://www.apache.org/");
             httpclient.execute(request2, new FutureCallback<HttpResponse>() {
 
+                @Override
                 public void completed(final HttpResponse response2) {
                     latch1.countDown();
                     System.out.println(request2.getRequestLine() + "->" + response2.getStatusLine());
                 }
 
+                @Override
                 public void failed(final Exception ex) {
                     latch1.countDown();
                     System.out.println(request2.getRequestLine() + "->" + ex);
                 }
 
+                @Override
                 public void cancelled() {
                     latch1.countDown();
                     System.out.println(request2.getRequestLine() + " cancelled");
@@ -111,16 +114,19 @@
             };
             httpclient.execute(producer3, consumer3, new FutureCallback<HttpResponse>() {
 
+                @Override
                 public void completed(final HttpResponse response3) {
                     latch2.countDown();
                     System.out.println(request2.getRequestLine() + "->" + response3.getStatusLine());
                 }
 
+                @Override
                 public void failed(final Exception ex) {
                     latch2.countDown();
                     System.out.println(request2.getRequestLine() + "->" + ex);
                 }
 
+                @Override
                 public void cancelled() {
                     latch2.countDown();
                     System.out.println(request2.getRequestLine() + " cancelled");
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
index 20059d3..7c3e52d 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
@@ -501,6 +501,7 @@
         }
     }
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
@@ -542,6 +543,7 @@
         return future;
     }
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
@@ -549,6 +551,7 @@
         return execute(requestProducer, responseConsumer, new BasicHttpContext(), callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpHost target, final HttpRequest request, final HttpContext context,
             final FutureCallback<HttpResponse> callback) {
@@ -558,18 +561,21 @@
                 context, callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpHost target, final HttpRequest request,
             final FutureCallback<HttpResponse> callback) {
         return execute(target, request, new BasicHttpContext(), callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpUriRequest request,
             final FutureCallback<HttpResponse> callback) {
         return execute(request, new BasicHttpContext(), callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpUriRequest request,
             final HttpContext context,
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
index 09fd86d..7cc987e 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
@@ -177,6 +177,7 @@
         this.id = COUNTER.getAndIncrement();
     }
 
+    @Override
     public void close() {
         if (this.closed) {
             return;
@@ -218,9 +219,11 @@
             if (request instanceof AbortableHttpRequest) {
                 ((AbortableHttpRequest) request).setReleaseTrigger(new ConnectionReleaseTrigger() {
 
+                    @Override
                     public void releaseConnection() throws IOException {
                     }
 
+                    @Override
                     public void abortConnection() throws IOException {
                         cancel();
                     }
@@ -241,10 +244,12 @@
         }
     }
 
+    @Override
     public HttpHost getTarget() {
         return this.requestProducer.getTarget();
     }
 
+    @Override
     public synchronized HttpRequest generateRequest() throws IOException, HttpException {
         final HttpRoute route = this.mainRequest.getRoute();
         if (!this.routeEstablished) {
@@ -321,6 +326,7 @@
         return this.currentRequest;
     }
 
+    @Override
     public synchronized void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         if (this.log.isDebugEnabled()) {
@@ -333,6 +339,7 @@
         }
     }
 
+    @Override
     public void requestCompleted(final HttpContext context) {
         if (this.log.isDebugEnabled()) {
             this.log.debug("[exchange: " + this.id + "] Request completed");
@@ -341,15 +348,18 @@
         this.requestProducer.requestCompleted(context);
     }
 
+    @Override
     public boolean isRepeatable() {
         return this.requestProducer.isRepeatable();
     }
 
+    @Override
     public void resetRequest() throws IOException {
         this.requestSent = false;
         this.requestProducer.resetRequest();
     }
 
+    @Override
     public synchronized void responseReceived(
             final HttpResponse response) throws IOException, HttpException {
         if (this.log.isDebugEnabled()) {
@@ -392,6 +402,7 @@
         }
     }
 
+    @Override
     public synchronized void consumeContent(
             final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
         if (this.log.isDebugEnabled()) {
@@ -423,6 +434,7 @@
         }
     }
 
+    @Override
     public synchronized void failed(final Exception ex) {
         try {
             if (!this.requestSent) {
@@ -438,6 +450,7 @@
         }
     }
 
+    @Override
     public synchronized void responseCompleted(final HttpContext context) {
         if (this.log.isDebugEnabled()) {
             this.log.debug("[exchange: " + this.id + "] Response fully read");
@@ -522,6 +535,7 @@
         }
     }
 
+    @Override
     public synchronized boolean cancel() {
         if (this.log.isDebugEnabled()) {
             this.log.debug("[exchange: " + this.id + "] Cancelled");
@@ -547,14 +561,17 @@
         }
     }
 
+    @Override
     public boolean isDone() {
         return this.resultCallback.isDone();
     }
 
+    @Override
     public T getResult() {
         return this.responseConsumer.getResult();
     }
 
+    @Override
     public Exception getException() {
         return this.responseConsumer.getException();
     }
@@ -614,14 +631,17 @@
 
     class InternalFutureCallback implements FutureCallback<ManagedClientAsyncConnection> {
 
+        @Override
         public void completed(final ManagedClientAsyncConnection session) {
             connectionRequestCompleted(session);
         }
 
+        @Override
         public void failed(final Exception ex) {
             connectionRequestFailed(ex);
         }
 
+        @Override
         public void cancelled() {
             connectionRequestCancelled();
         }
@@ -858,14 +878,17 @@
         return null;
     }
 
+    @Override
     public HttpContext getContext() {
         return this.localContext;
     }
 
+    @Override
     public HttpProcessor getHttpProcessor() {
         return this.httppocessor;
     }
 
+    @Override
     public ConnectionReuseStrategy getConnectionReuseStrategy() {
         return this.reuseStrategy;
     }
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultResultCallback.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultResultCallback.java
index 46067aa..ecf0acf 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultResultCallback.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultResultCallback.java
@@ -44,21 +44,25 @@
         this.queue = queue;
     }
 
+    @Override
     public void completed(final T result, final HttpAsyncRequestExecutionHandler<T> handler) {
         this.future.completed(result);
         this.queue.remove(handler);
     }
 
+    @Override
     public void failed(final Exception ex, final HttpAsyncRequestExecutionHandler<T> handler) {
         this.future.failed(ex);
         this.queue.remove(handler);
     }
 
+    @Override
     public void cancelled(final HttpAsyncRequestExecutionHandler<T> handler) {
         this.future.cancel(true);
         this.queue.remove(handler);
     }
 
+    @Override
     public boolean isDone() {
         return this.future.isDone();
     }
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
index 4a83438..6dae8d9 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
@@ -64,6 +64,7 @@
         }
     }
 
+    @Override
     public void upgrade(final IOSession iosession) {
         this.original = iosession;
         if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
@@ -74,6 +75,7 @@
         }
     }
 
+    @Override
     public IOSession getIOSession() {
         return this.original;
     }
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
index e62da82..3c19cab 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
@@ -85,6 +85,7 @@
         this.allocator = createByteBufferAllocator();
     }
 
+    @Override
     @Deprecated
     public ClientAsyncConnection create(
             final String id,
@@ -104,6 +105,7 @@
         return DefaultHttpResponseFactory.INSTANCE;
     }
 
+    @Override
     public ManagedNHttpClientConnection create(
             final IOSession iosession, final ConnectionConfig config) {
         final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
index a3bd4a1..d2bd306 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
@@ -60,6 +60,7 @@
         return reg;
     }
 
+    @Override
     public HttpRoute determineRoute(
             final HttpHost target,
             final HttpRequest request,
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPoolFactory.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPoolFactory.java
index 35c968e..9ef747d 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPoolFactory.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPoolFactory.java
@@ -35,6 +35,7 @@
 @Deprecated
 class HttpNIOConnPoolFactory implements NIOConnFactory<HttpRoute, IOSession> {
 
+    @Override
     public IOSession create(final HttpRoute route, final IOSession session) throws IOException {
         return session;
     }
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
index 638ed06..77f183a 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
@@ -115,6 +115,7 @@
         return local;
     }
 
+    @Override
     public void close() throws IOException {
         final ClientAsyncConnection conn = getConnection();
         if (conn != null) {
@@ -122,6 +123,7 @@
         }
     }
 
+    @Override
     public void shutdown() throws IOException {
         final ClientAsyncConnection conn = getConnection();
         if (conn != null) {
@@ -129,6 +131,7 @@
         }
     }
 
+    @Override
     public boolean isOpen() {
         final ClientAsyncConnection conn = getConnection();
         if (conn != null) {
@@ -138,115 +141,138 @@
         }
     }
 
+    @Override
     public boolean isStale() {
         return isOpen();
     }
 
+    @Override
     public void setSocketTimeout(final int timeout) {
         final ClientAsyncConnection conn = ensureConnection();
         conn.setSocketTimeout(timeout);
     }
 
+    @Override
     public int getSocketTimeout() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getSocketTimeout();
     }
 
+    @Override
     public HttpConnectionMetrics getMetrics() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getMetrics();
     }
 
+    @Override
     public InetAddress getLocalAddress() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getLocalAddress();
     }
 
+    @Override
     public int getLocalPort() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getLocalPort();
     }
 
+    @Override
     public InetAddress getRemoteAddress() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getRemoteAddress();
     }
 
+    @Override
     public int getRemotePort() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getRemotePort();
     }
 
+    @Override
     public int getStatus() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getStatus();
     }
 
+    @Override
     public HttpRequest getHttpRequest() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getHttpRequest();
     }
 
+    @Override
     public HttpResponse getHttpResponse() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getHttpResponse();
     }
 
+    @Override
     public HttpContext getContext() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getContext();
     }
 
+    @Override
     public void requestInput() {
         final ClientAsyncConnection conn = ensureConnection();
         conn.requestInput();
     }
 
+    @Override
     public void suspendInput() {
         final ClientAsyncConnection conn = ensureConnection();
         conn.suspendInput();
     }
 
+    @Override
     public void requestOutput() {
         final ClientAsyncConnection conn = ensureConnection();
         conn.requestOutput();
     }
 
+    @Override
     public void suspendOutput() {
         final ClientAsyncConnection conn = ensureConnection();
         conn.suspendOutput();
     }
 
+    @Override
     public void submitRequest(final HttpRequest request) throws IOException, HttpException {
         final ClientAsyncConnection conn = ensureConnection();
         conn.submitRequest(request);
     }
 
+    @Override
     public boolean isRequestSubmitted() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.isRequestSubmitted();
     }
 
+    @Override
     public void resetOutput() {
         final ClientAsyncConnection conn = ensureConnection();
         conn.resetOutput();
     }
 
+    @Override
     public void resetInput() {
         final ClientAsyncConnection conn = ensureConnection();
         conn.resetInput();
     }
 
+    @Override
     public boolean isSecure() {
         final ClientAsyncConnection conn = ensureConnection();
         return conn.getIOSession() instanceof SSLIOSession;
     }
 
+    @Override
     public HttpRoute getRoute() {
         final HttpPoolEntry entry = ensurePoolEntry();
         return entry.getEffectiveRoute();
     }
 
+    @Override
     public SSLSession getSSLSession() {
         final ClientAsyncConnection conn = ensureConnection();
         final IOSession iosession = conn.getIOSession();
@@ -257,28 +283,34 @@
         }
     }
 
+    @Override
     public Object getState() {
         final HttpPoolEntry entry = ensurePoolEntry();
         return entry.getState();
     }
 
+    @Override
     public void setState(final Object state) {
         final HttpPoolEntry entry = ensurePoolEntry();
         entry.setState(state);
     }
 
+    @Override
     public void markReusable() {
         this.reusable = true;
     }
 
+    @Override
     public void unmarkReusable() {
         this.reusable = false;
     }
 
+    @Override
     public boolean isMarkedReusable() {
         return this.reusable;
     }
 
+    @Override
     public void setIdleDuration(final long duration, final TimeUnit unit) {
         if(duration > 0) {
             this.duration = unit.toMillis(duration);
@@ -296,6 +328,7 @@
         return reg;
     }
 
+    @Override
     public synchronized void open(
             final HttpRoute route,
             final HttpContext context,
@@ -331,6 +364,7 @@
         }
     }
 
+    @Override
     public synchronized void tunnelProxy(
             final HttpHost next, final HttpParams params) throws IOException {
         final HttpPoolEntry entry = ensurePoolEntry();
@@ -341,6 +375,7 @@
         tracker.tunnelProxy(next, false);
     }
 
+    @Override
     public synchronized void tunnelTarget(
             final HttpParams params) throws IOException {
         final HttpPoolEntry entry = ensurePoolEntry();
@@ -354,6 +389,7 @@
         tracker.tunnelTarget(false);
     }
 
+    @Override
     public synchronized void layerProtocol(
             final HttpContext context, final HttpParams params) throws IOException {
         final HttpPoolEntry entry = ensurePoolEntry();
@@ -381,6 +417,7 @@
         tracker.layerProtocol(layeringStrategy.isSecure());
     }
 
+    @Override
     public synchronized void releaseConnection() {
         if (this.poolEntry == null) {
             return;
@@ -389,6 +426,7 @@
         this.poolEntry = null;
     }
 
+    @Override
     public synchronized void abortConnection() {
         if (this.poolEntry == null) {
             return;
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
index 57472cb..582243e 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
@@ -96,24 +96,29 @@
         return new DefaultClientAsyncConnectionFactory();
     }
 
+    @Override
     public AsyncSchemeRegistry getSchemeRegistry() {
         return this.schemeRegistry;
     }
 
+    @Override
     public void execute(final IOEventDispatch eventDispatch) throws IOException {
         this.ioreactor.execute(eventDispatch);
     }
 
+    @Override
     public IOReactorStatus getStatus() {
         return this.ioreactor.getStatus();
     }
 
+    @Override
     public void shutdown(final long waitMs) throws IOException {
         this.log.debug("Connection manager is shutting down");
         this.pool.shutdown(waitMs);
         this.log.debug("Connection manager shut down");
     }
 
+    @Override
     public void shutdown() throws IOException {
         this.log.debug("Connection manager is shutting down");
         this.pool.shutdown(2000);
@@ -152,6 +157,7 @@
         return buf.toString();
     }
 
+    @Override
     public Future<ManagedClientAsyncConnection> leaseConnection(
             final HttpRoute route,
             final Object state,
@@ -169,6 +175,7 @@
         return future;
     }
 
+    @Override
     public void releaseConnection(
             final ManagedClientAsyncConnection conn,
             final long keepalive,
@@ -226,34 +233,42 @@
         }
     }
 
+    @Override
     public PoolStats getTotalStats() {
         return this.pool.getTotalStats();
     }
 
+    @Override
     public PoolStats getStats(final HttpRoute route) {
         return this.pool.getStats(route);
     }
 
+    @Override
     public void setMaxTotal(final int max) {
         this.pool.setMaxTotal(max);
     }
 
+    @Override
     public void setDefaultMaxPerRoute(final int max) {
         this.pool.setDefaultMaxPerRoute(max);
     }
 
+    @Override
     public void setMaxPerRoute(final HttpRoute route, final int max) {
         this.pool.setMaxPerRoute(route, max);
     }
 
+    @Override
     public int getMaxTotal() {
         return this.pool.getMaxTotal();
     }
 
+    @Override
     public int getDefaultMaxPerRoute() {
         return this.pool.getDefaultMaxPerRoute();
     }
 
+    @Override
     public int getMaxPerRoute(final HttpRoute route) {
         return this.pool.getMaxPerRoute(route);
     }
@@ -280,6 +295,7 @@
             this.future = future;
         }
 
+        @Override
         public void completed(final HttpPoolEntry entry) {
             if (log.isDebugEnabled()) {
                 log.debug("Connection leased: " + format(entry) + formatStats(entry.getRoute()));
@@ -293,6 +309,7 @@
             }
         }
 
+        @Override
         public void failed(final Exception ex) {
             if (log.isDebugEnabled()) {
                 log.debug("Connection request failed", ex);
@@ -300,6 +317,7 @@
             this.future.failed(ex);
         }
 
+        @Override
         public void cancelled() {
             log.debug("Connection request cancelled");
             this.future.cancel(true);
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
index c8b1240..e1c852d 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
@@ -178,10 +178,12 @@
         this(sslContext, new BrowserCompatHostnameVerifier());
     }
 
+    @Override
     public boolean isSecure() {
         return true;
     }
 
+    @Override
     public SSLIOSession layer(final IOSession iosession) {
         final SSLIOSession ssliosession = new SSLIOSession(
             iosession,
@@ -189,11 +191,13 @@
             this.sslContext,
             new SSLSetupHandler() {
 
+                @Override
                 public void initalize(
                         final SSLEngine sslengine) throws SSLException {
                     initializeEngine(sslengine);
                 }
 
+                @Override
                 public void verify(
                         final IOSession iosession,
                         final SSLSession sslsession) throws SSLException {
diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/TrustManagerDecorator.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/TrustManagerDecorator.java
index 7bf94eb..af50d99 100644
--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/TrustManagerDecorator.java
+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/TrustManagerDecorator.java
@@ -45,11 +45,13 @@
         this.trustStrategy = trustStrategy;
     }
 
+    @Override
     public void checkClientTrusted(
             final X509Certificate[] chain, final String authType) throws CertificateException {
         this.trustManager.checkClientTrusted(chain, authType);
     }
 
+    @Override
     public void checkServerTrusted(
             final X509Certificate[] chain, final String authType) throws CertificateException {
         if (!this.trustStrategy.isTrusted(chain, authType)) {
@@ -57,6 +59,7 @@
         }
     }
 
+    @Override
     public X509Certificate[] getAcceptedIssuers() {
         return this.trustManager.getAcceptedIssuers();
     }
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
index 8cf925e..d921369 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
@@ -59,6 +59,7 @@
 
     public abstract void start();
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
@@ -66,6 +67,7 @@
         return execute(requestProducer, responseConsumer, new BasicHttpContext(), callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpHost target, final HttpRequest request, final HttpContext context,
             final FutureCallback<HttpResponse> callback) {
@@ -75,18 +77,21 @@
                 context, callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpHost target, final HttpRequest request,
             final FutureCallback<HttpResponse> callback) {
         return execute(target, request, new BasicHttpContext(), callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpUriRequest request,
             final FutureCallback<HttpResponse> callback) {
         return execute(request, new BasicHttpContext(), callback);
     }
 
+    @Override
     public Future<HttpResponse> execute(
             final HttpUriRequest request,
             final HttpContext context,
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java
index 8d81961..03e4ac5 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java
@@ -94,6 +94,7 @@
                 "I/O reactor status: %s", currentStatus);
     }
 
+    @Override
     public void close() {
         if (this.status.compareAndSet(Status.ACTIVE, Status.STOPPED)) {
             if (this.reactorThread != null) {
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
index c0dcdf4..f599fdd 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
@@ -60,6 +60,7 @@
 
     public static final DefaultAsyncUserTokenHandler INSTANCE = new DefaultAsyncUserTokenHandler();
 
+    @Override
     public Object getUserToken(final HttpContext context) {
 
         final HttpClientContext clientContext = HttpClientContext.adapt(context);
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java
index 7169ef8..3db481f 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java
@@ -98,6 +98,7 @@
         this.managedConn = new AtomicReference<NHttpClientConnection>(null);
     }
 
+    @Override
     public void close() {
         if (this.closed.getAndSet(true)) {
             return;
@@ -126,28 +127,34 @@
         requestConnection();
     }
 
+    @Override
     public boolean isDone() {
         return this.completed.get();
     }
 
+    @Override
     public HttpRequest generateRequest() throws IOException, HttpException {
         return this.exec.generateRequest(this.state, this);
     }
 
+    @Override
     public void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         this.exec.produceContent(this.state, encoder, ioctrl);
     }
 
+    @Override
     public void requestCompleted() {
         this.exec.requestCompleted(this.state);
     }
 
+    @Override
     public void responseReceived(
             final HttpResponse response) throws IOException, HttpException {
         this.exec.responseReceived(this.state, response);
     }
 
+    @Override
     public void consumeContent(
             final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
         this.exec.consumeContent(this.state, decoder, ioctrl);
@@ -163,6 +170,7 @@
         }
     }
 
+    @Override
     public void responseCompleted() throws IOException, HttpException {
         this.exec.responseCompleted(this.state, this);
 
@@ -194,6 +202,7 @@
         }
     }
 
+    @Override
     public void inputTerminated() {
         if (!this.completed.get()) {
             requestConnection();
@@ -202,6 +211,7 @@
         }
     }
 
+    @Override
     public void releaseConnection() {
         final NHttpClientConnection localConn = this.managedConn.getAndSet(null);
         if (localConn != null) {
@@ -230,6 +240,7 @@
         }
     }
 
+    @Override
     public void abortConnection() {
         discardConnection();
     }
@@ -252,6 +263,7 @@
         }
     }
 
+    @Override
     public void failed(final Exception ex) {
         try {
             this.requestProducer.failed(ex);
@@ -265,6 +277,7 @@
         }
     }
 
+    @Override
     public boolean cancel() {
         if (this.log.isDebugEnabled()) {
             this.log.debug("[exchange: " + this.state.getId() + "] Cancelled");
@@ -355,14 +368,17 @@
                 TimeUnit.MILLISECONDS,
                 new FutureCallback<NHttpClientConnection>() {
 
+                    @Override
                     public void completed(final NHttpClientConnection managedConn) {
                         connectionAllocated(managedConn);
                     }
 
+                    @Override
                     public void failed(final Exception ex) {
                         connectionRequestFailed(ex);
                     }
 
+                    @Override
                     public void cancelled() {
                         connectionRequestCancelled();
                     }
@@ -370,6 +386,7 @@
                 });
     }
 
+    @Override
     public NHttpClientConnection getConnection() {
         return this.managedConn.get();
     }
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
index 959ca97..327794d 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
@@ -104,6 +104,7 @@
         }
     }
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalIOReactorExceptionHandler.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalIOReactorExceptionHandler.java
index d92a934..1fc0634 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalIOReactorExceptionHandler.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalIOReactorExceptionHandler.java
@@ -40,11 +40,13 @@
         this.log = log;
     }
 
+    @Override
     public boolean handle(final IOException ex) {
         this.log.error("Fatal I/O error", ex);
         return false;
     }
 
+    @Override
     public boolean handle(final RuntimeException ex) {
         this.log.error("Fatal runtime error", ex);
         return false;
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java
index 95ff06c..c25d5ec 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java
@@ -125,6 +125,7 @@
         this.authenticator = new HttpAuthenticator(log);
     }
 
+    @Override
     public void prepare(
             final InternalState state,
             final HttpHost target,
@@ -156,6 +157,7 @@
         prepareRequest(state);
     }
 
+    @Override
     public HttpRequest generateRequest(
             final InternalState state,
             final InternalConnManager connManager) throws IOException, HttpException {
@@ -271,6 +273,7 @@
         return currentRequest;
     }
 
+    @Override
     public void produceContent(
             final InternalState state,
             final ContentEncoder encoder,
@@ -286,6 +289,7 @@
         }
     }
 
+    @Override
     public void requestCompleted(final InternalState state) {
         if (this.log.isDebugEnabled()) {
             this.log.debug("[exchange: " + state.getId() + "] Request completed");
@@ -295,6 +299,7 @@
         requestProducer.requestCompleted(localContext);
     }
 
+    @Override
     public void responseReceived(
             final InternalState state,
             final HttpResponse response) throws IOException, HttpException {
@@ -333,6 +338,7 @@
         }
     }
 
+    @Override
     public void consumeContent(
             final InternalState state,
             final ContentDecoder decoder,
@@ -350,6 +356,7 @@
         }
     }
 
+    @Override
     public void responseCompleted(
             final InternalState state,
             final InternalConnManager connManager) throws IOException, HttpException {
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExec.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExec.java
index 4576b06..859f03c 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExec.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExec.java
@@ -73,6 +73,7 @@
         this.keepaliveStrategy = keepaliveStrategy;
     }
 
+    @Override
     public void prepare(
             final InternalState state,
             final HttpHost target,
@@ -102,6 +103,7 @@
         this.httpProcessor.process(request, localContext);
     }
 
+    @Override
     public HttpRequest generateRequest(
             final InternalState state,
             final InternalConnManager connManager) throws IOException, HttpException {
@@ -120,6 +122,7 @@
         return state.getCurrentRequest();
     }
 
+    @Override
     public void produceContent(
             final InternalState state,
             final ContentEncoder encoder,
@@ -135,6 +138,7 @@
         }
     }
 
+    @Override
     public void requestCompleted(final InternalState state) {
         if (this.log.isDebugEnabled()) {
             this.log.debug("[exchange: " + state.getId() + "] Request completed");
@@ -144,6 +148,7 @@
         requestProducer.requestCompleted(localContext);
     }
 
+    @Override
     public void responseReceived(
             final InternalState state,
             final HttpResponse response) throws IOException, HttpException {
@@ -159,6 +164,7 @@
         responseConsumer.responseReceived(response);
     }
 
+    @Override
     public void consumeContent(
             final InternalState state,
             final ContentDecoder decoder,
@@ -170,6 +176,7 @@
         responseConsumer.consumeContent(decoder, ioctrl);
     }
 
+    @Override
     public void responseCompleted(
             final InternalState state,
             final InternalConnManager connManager) throws IOException, HttpException {
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
index f2e15cb..7e64173 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
@@ -81,6 +81,7 @@
         this(connmgr, Executors.defaultThreadFactory(), new LoggingAsyncRequestExecutor());
     }
 
+    @Override
     public <T> Future<T> execute(
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java
index e26fe98..57db166 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java
@@ -54,18 +54,22 @@
         this.wirelog = new Wire(wirelog, this.id);
     }
 
+    @Override
     public ByteChannel channel() {
         return this.channel;
     }
 
+    @Override
     public SocketAddress getLocalAddress() {
         return this.session.getLocalAddress();
     }
 
+    @Override
     public SocketAddress getRemoteAddress() {
         return this.session.getRemoteAddress();
     }
 
+    @Override
     public int getEventMask() {
         return this.session.getEventMask();
     }
@@ -89,6 +93,7 @@
         return buffer.toString();
     }
 
+    @Override
     public void setEventMask(final int ops) {
         this.session.setEventMask(ops);
         if (this.log.isDebugEnabled()) {
@@ -96,6 +101,7 @@
         }
     }
 
+    @Override
     public void setEvent(final int op) {
         this.session.setEvent(op);
         if (this.log.isDebugEnabled()) {
@@ -103,6 +109,7 @@
         }
     }
 
+    @Override
     public void clearEvent(final int op) {
         this.session.clearEvent(op);
         if (this.log.isDebugEnabled()) {
@@ -110,6 +117,7 @@
         }
     }
 
+    @Override
     public void close() {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + " " + this.session + ": Close");
@@ -117,14 +125,17 @@
         this.session.close();
     }
 
+    @Override
     public int getStatus() {
         return this.session.getStatus();
     }
 
+    @Override
     public boolean isClosed() {
         return this.session.isClosed();
     }
 
+    @Override
     public void shutdown() {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + " " + this.session + ": Shutdown");
@@ -132,10 +143,12 @@
         this.session.shutdown();
     }
 
+    @Override
     public int getSocketTimeout() {
         return this.session.getSocketTimeout();
     }
 
+    @Override
     public void setSocketTimeout(final int timeout) {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + " " + this.session + ": Set timeout " + timeout);
@@ -143,22 +156,27 @@
         this.session.setSocketTimeout(timeout);
     }
 
+    @Override
     public void setBufferStatus(final SessionBufferStatus status) {
         this.session.setBufferStatus(status);
     }
 
+    @Override
     public boolean hasBufferedInput() {
         return this.session.hasBufferedInput();
     }
 
+    @Override
     public boolean hasBufferedOutput() {
         return this.session.hasBufferedOutput();
     }
 
+    @Override
     public Object getAttribute(final String name) {
         return this.session.getAttribute(name);
     }
 
+    @Override
     public void setAttribute(final String name, final Object obj) {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + " " + this.session + ": Set attribute " + name);
@@ -166,6 +184,7 @@
         this.session.setAttribute(name, obj);
     }
 
+    @Override
     public Object removeAttribute(final String name) {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + " " + this.session + ": Remove attribute " + name);
@@ -180,6 +199,7 @@
 
     class LoggingByteChannel implements ByteChannel {
 
+        @Override
         public int read(final ByteBuffer dst) throws IOException {
             final int bytesRead = session.channel().read(dst);
             if (log.isDebugEnabled()) {
@@ -195,6 +215,7 @@
             return bytesRead;
         }
 
+        @Override
         public int write(final ByteBuffer src) throws IOException {
             final int byteWritten = session.channel().write(src);
             if (log.isDebugEnabled()) {
@@ -210,6 +231,7 @@
             return byteWritten;
         }
 
+        @Override
         public void close() throws IOException {
             if (log.isDebugEnabled()) {
                 log.debug(id + " " + session + ": Channel close");
@@ -217,6 +239,7 @@
             session.channel().close();
         }
 
+        @Override
         public boolean isOpen() {
             return session.channel().isOpen();
         }
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java
index 84e9baf..83d0738 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java
@@ -83,6 +83,7 @@
         this(null, null, null);
     }
 
+    @Override
     public ManagedNHttpClientConnection create(
             final IOSession iosession, final ConnectionConfig config) {
         final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java
index 5fcadb6..e52d9c1 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java
@@ -100,10 +100,12 @@
         }
     }
 
+    @Override
     public IOSession getIOSession() {
         return this.original;
     }
 
+    @Override
     public SSLSession getSSLSession() {
         if (this.original instanceof SSLIOSession) {
             return ((SSLIOSession) this.original).getSSLSession();
@@ -112,6 +114,7 @@
         }
     }
 
+    @Override
     public String getId() {
         return this.id;
     }
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
index b4ec34c..07111f5 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
@@ -186,6 +186,7 @@
         }
     }
 
+    @Override
     public void execute(final IOEventDispatch eventDispatch) throws IOException {
         this.ioreactor.execute(eventDispatch);
     }
@@ -196,6 +197,7 @@
         this.log.debug("Connection manager shut down");
     }
 
+    @Override
     public void shutdown() throws IOException {
         this.log.debug("Connection manager is shutting down");
         this.pool.shutdown(2000);
@@ -234,6 +236,7 @@
         return buf.toString();
     }
 
+    @Override
     public Future<NHttpClientConnection> requestConnection(
             final HttpRoute route,
             final Object state,
@@ -265,6 +268,7 @@
         return future;
     }
 
+    @Override
     public void releaseConnection(
             final NHttpClientConnection managedConn,
             final Object state,
@@ -313,6 +317,7 @@
         return reg;
     }
 
+    @Override
     public void startRoute(
             final NHttpClientConnection managedConn,
             final HttpRoute route,
@@ -341,6 +346,7 @@
         }
     }
 
+    @Override
     public void upgrade(
             final NHttpClientConnection managedConn,
             final HttpRoute route,
@@ -366,6 +372,7 @@
         }
     }
 
+    @Override
     public void routeComplete(
             final NHttpClientConnection managedConn,
             final HttpRoute route,
@@ -378,6 +385,7 @@
         }
     }
 
+    @Override
     public boolean isRouteComplete(
             final NHttpClientConnection managedConn) {
         Args.notNull(managedConn, "Managed connection");
@@ -387,6 +395,7 @@
         }
     }
 
+    @Override
     public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
         if (this.log.isDebugEnabled()) {
             this.log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
@@ -394,39 +403,48 @@
         this.pool.closeIdle(idleTimeout, tunit);
     }
 
+    @Override
     public void closeExpiredConnections() {
         log.debug("Closing expired connections");
         this.pool.closeExpired();
     }
 
+    @Override
     public int getMaxTotal() {
         return this.pool.getMaxTotal();
     }
 
+    @Override
     public void setMaxTotal(final int max) {
         this.pool.setMaxTotal(max);
     }
 
+    @Override
     public int getDefaultMaxPerRoute() {
         return this.pool.getDefaultMaxPerRoute();
     }
 
+    @Override
     public void setDefaultMaxPerRoute(final int max) {
         this.pool.setDefaultMaxPerRoute(max);
     }
 
+    @Override
     public int getMaxPerRoute(final HttpRoute route) {
         return this.pool.getMaxPerRoute(route);
     }
 
+    @Override
     public void setMaxPerRoute(final HttpRoute route, final int max) {
         this.pool.setMaxPerRoute(route, max);
     }
 
+    @Override
     public PoolStats getTotalStats() {
         return this.pool.getTotalStats();
     }
 
+    @Override
     public PoolStats getStats(final HttpRoute route) {
         return this.pool.getStats(route);
     }
@@ -464,6 +482,7 @@
             this.future = future;
         }
 
+        @Override
         public void completed(final CPoolEntry entry) {
             Asserts.check(entry.getConnection() != null, "Pool entry with no connection");
             if (log.isDebugEnabled()) {
@@ -475,6 +494,7 @@
             }
         }
 
+        @Override
         public void failed(final Exception ex) {
             if (log.isDebugEnabled()) {
                 log.debug("Connection request failed", ex);
@@ -482,6 +502,7 @@
             this.future.failed(ex);
         }
 
+        @Override
         public void cancelled() {
             log.debug("Connection request cancelled");
             this.future.cancel(true);
@@ -531,6 +552,7 @@
                 ManagedNHttpClientConnectionFactory.INSTANCE;
         }
 
+        @Override
         public ManagedNHttpClientConnection create(
                 final HttpRoute route, final IOSession iosession) throws IOException {
             ConnectionConfig config = null;
@@ -568,10 +590,12 @@
                     SystemDefaultDnsResolver.INSTANCE;
         }
 
+        @Override
         public SocketAddress resolveLocalAddress(final HttpRoute route) throws IOException {
             return route.getLocalAddress() != null ? new InetSocketAddress(route.getLocalAddress(), 0) : null;
         }
 
+        @Override
         public SocketAddress resolveRemoteAddress(final HttpRoute route) throws IOException {
             final HttpHost host;
             if (route.getProxyHost() != null) {
diff --git a/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java b/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java
index e9d002b..ae813b7 100644
--- a/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java
+++ b/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java
@@ -80,6 +80,7 @@
 
     protected abstract HttpEntityEnclosingRequest createRequest(final URI requestURI, final HttpEntity entity);
 
+    @Override
     public HttpRequest generateRequest() throws IOException, HttpException {
         final BasicHttpEntity entity = new BasicHttpEntity();
         entity.setChunked(false);
@@ -90,10 +91,12 @@
         return createRequest(this.requestURI, entity);
     }
 
+    @Override
     public synchronized HttpHost getTarget() {
         return URIUtils.extractHost(this.requestURI);
     }
 
+    @Override
     public synchronized void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         if (this.fileChannel == null) {
@@ -118,20 +121,25 @@
         }
     }
 
+    @Override
     public void requestCompleted(final HttpContext context) {
     }
 
+    @Override
     public void failed(final Exception ex) {
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
 
+    @Override
     public synchronized void resetRequest() throws IOException {
         closeChannel();
     }
 
+    @Override
     public synchronized void close() throws IOException {
         try {
             this.accessfile.close();
diff --git a/httpasyncclient/src/main/java/org/apache/http/nio/conn/NoopIOSessionStrategy.java b/httpasyncclient/src/main/java/org/apache/http/nio/conn/NoopIOSessionStrategy.java
index c241b63..e88053b 100644
--- a/httpasyncclient/src/main/java/org/apache/http/nio/conn/NoopIOSessionStrategy.java
+++ b/httpasyncclient/src/main/java/org/apache/http/nio/conn/NoopIOSessionStrategy.java
@@ -39,10 +39,12 @@
 
     public static final NoopIOSessionStrategy INSTANCE = new NoopIOSessionStrategy();
 
+    @Override
     public IOSession upgrade(final HttpHost host, final IOSession iosession) {
         return iosession;
     }
 
+    @Override
     public boolean isLayeringRequired() {
         return false;
     }
diff --git a/httpasyncclient/src/main/java/org/apache/http/nio/conn/ssl/SSLIOSessionStrategy.java b/httpasyncclient/src/main/java/org/apache/http/nio/conn/ssl/SSLIOSessionStrategy.java
index 2cce9f7..3e26bda 100644
--- a/httpasyncclient/src/main/java/org/apache/http/nio/conn/ssl/SSLIOSessionStrategy.java
+++ b/httpasyncclient/src/main/java/org/apache/http/nio/conn/ssl/SSLIOSessionStrategy.java
@@ -155,6 +155,7 @@
         this(sslcontext, null, null, getDefaultHostnameVerifier());
     }
 
+    @Override
     public SSLIOSession upgrade(final HttpHost host, final IOSession iosession) throws IOException {
         Asserts.check(!(iosession instanceof SSLIOSession), "I/O session is already upgraded to TLS/SSL");
         final SSLIOSession ssliosession = new SSLIOSession(
@@ -163,6 +164,7 @@
             this.sslContext,
             new SSLSetupHandler() {
 
+                @Override
                 public void initalize(
                         final SSLEngine sslengine) throws SSLException {
                     if (supportedProtocols != null) {
@@ -174,6 +176,7 @@
                     initializeEngine(sslengine);
                 }
 
+                @Override
                 public void verify(
                         final IOSession iosession,
                         final SSLSession sslsession) throws SSLException {
@@ -196,6 +199,7 @@
         this.hostnameVerifier.verify(host.getHostName(), sslsession);
     }
 
+    @Override
     public boolean isLayeringRequired() {
         return true;
     }
diff --git a/httpasyncclient/src/test/java/org/apache/http/localserver/EchoHandler.java b/httpasyncclient/src/test/java/org/apache/http/localserver/EchoHandler.java
index a8cec9b..21b6d54 100644
--- a/httpasyncclient/src/test/java/org/apache/http/localserver/EchoHandler.java
+++ b/httpasyncclient/src/test/java/org/apache/http/localserver/EchoHandler.java
@@ -60,6 +60,7 @@
      * @throws HttpException    in case of a problem
      * @throws IOException      in case of an IO problem
      */
+    @Override
     public void handle(final HttpRequest request,
                        final HttpResponse response,
                        final HttpContext context)
diff --git a/httpasyncclient/src/test/java/org/apache/http/localserver/RandomHandler.java b/httpasyncclient/src/test/java/org/apache/http/localserver/RandomHandler.java
index a774715..966b500 100644
--- a/httpasyncclient/src/test/java/org/apache/http/localserver/RandomHandler.java
+++ b/httpasyncclient/src/test/java/org/apache/http/localserver/RandomHandler.java
@@ -68,6 +68,7 @@
      * @throws HttpException    in case of a problem
      * @throws IOException      in case of an IO problem
      */
+    @Override
     public void handle(final HttpRequest request,
                        final HttpResponse response,
                        final HttpContext context)
diff --git a/httpasyncclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java b/httpasyncclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java
index 5e5fca8..5723bd6 100644
--- a/httpasyncclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java
+++ b/httpasyncclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java
@@ -43,6 +43,7 @@
         this.authTokenExtractor = new BasicAuthTokenExtractor();
     }
 
+    @Override
     public void process(
             final HttpRequest request,
             final HttpContext context) throws HttpException, IOException {
diff --git a/httpasyncclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java b/httpasyncclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java
index 01cca6f..a1c58d8 100644
--- a/httpasyncclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java
+++ b/httpasyncclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java
@@ -38,6 +38,7 @@
 
 public class ResponseBasicUnauthorized implements HttpResponseInterceptor {
 
+    @Override
     public void process(
             final HttpResponse response,
             final HttpContext context) throws HttpException, IOException {
diff --git a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java
index ef0fceb..774f95f 100644
--- a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java
+++ b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java
@@ -110,6 +110,7 @@
             this(true);
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -168,6 +169,7 @@
             this.authTokenExtractor = new BasicAuthTokenExtractor();
         }
 
+        @Override
         public void verify(
                 final HttpAsyncExchange httpexchange,
                 final HttpContext context) throws HttpException, IOException {
@@ -197,14 +199,17 @@
             this.creds = creds;
         }
 
+        @Override
         public void clear() {
         }
 
+        @Override
         public Credentials getCredentials(final AuthScope authscope) {
             this.authscope = authscope;
             return this.creds;
         }
 
+        @Override
         public void setCredentials(final AuthScope authscope, final Credentials credentials) {
         }
 
@@ -438,6 +443,7 @@
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
diff --git a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java
index d56e0af..d6fcc07 100644
--- a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java
+++ b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java
@@ -67,6 +67,7 @@
 
     public class ResponseBasicUnauthorized implements HttpResponseInterceptor {
 
+        @Override
         public void process(
                 final HttpResponse response,
                 final HttpContext context) throws HttpException, IOException {
@@ -80,6 +81,7 @@
 
     static class AuthHandler implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -106,14 +108,17 @@
             this.creds = creds;
         }
 
+        @Override
         public void clear() {
         }
 
+        @Override
         public Credentials getCredentials(final AuthScope authscope) {
             this.authscope = authscope;
             return this.creds;
         }
 
+        @Override
         public void setCredentials(final AuthScope authscope, final Credentials credentials) {
         }
 
diff --git a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java
index af85542..40bf2bb 100644
--- a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java
+++ b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java
@@ -76,6 +76,7 @@
 
     public class ResponseBasicUnauthorized implements HttpResponseInterceptor {
 
+        @Override
         public void process(
                 final HttpResponse response,
                 final HttpContext context) throws HttpException, IOException {
@@ -90,6 +91,7 @@
 
         private final AtomicLong count = new AtomicLong(0);
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -121,14 +123,17 @@
             this.creds = creds;
         }
 
+        @Override
         public void clear() {
         }
 
+        @Override
         public Credentials getCredentials(final AuthScope authscope) {
             this.authscope = authscope;
             return this.creds;
         }
 
+        @Override
         public void setCredentials(final AuthScope authscope, final Credentials credentials) {
         }
 
diff --git a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncPrematureTermination.java b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncPrematureTermination.java
index b8fb00d..f0a6b26 100644
--- a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncPrematureTermination.java
+++ b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncPrematureTermination.java
@@ -72,6 +72,7 @@
     public void testConnectionTerminatedProcessingRequest() throws Exception {
         this.serverBootstrap.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
 
+            @Override
             public HttpAsyncRequestConsumer<HttpRequest> processRequest(
                     final HttpRequest request,
                     final HttpContext context) throws HttpException, IOException {
@@ -81,6 +82,7 @@
                 return new BasicAsyncRequestConsumer();
             }
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpAsyncExchange httpExchange,
@@ -99,14 +101,17 @@
 
         final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
 
+            @Override
             public void cancelled() {
                 latch.countDown();
             }
 
+            @Override
             public void failed(final Exception ex) {
                 latch.countDown();
             }
 
+            @Override
             public void completed(final HttpResponse response) {
                 Assert.fail();
             }
@@ -121,12 +126,14 @@
     public void testConnectionTerminatedHandlingRequest() throws Exception {
         this.serverBootstrap.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
 
+            @Override
             public HttpAsyncRequestConsumer<HttpRequest> processRequest(
                     final HttpRequest request,
                     final HttpContext context) throws HttpException, IOException {
                 return new BasicAsyncRequestConsumer();
             }
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpAsyncExchange httpExchange,
@@ -148,14 +155,17 @@
 
         final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
 
+            @Override
             public void cancelled() {
                 latch.countDown();
             }
 
+            @Override
             public void failed(final Exception ex) {
                 latch.countDown();
             }
 
+            @Override
             public void completed(final HttpResponse response) {
                 Assert.fail();
             }
@@ -170,12 +180,14 @@
     public void testConnectionTerminatedSendingResponse() throws Exception {
         this.serverBootstrap.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
 
+            @Override
             public HttpAsyncRequestConsumer<HttpRequest> processRequest(
                     final HttpRequest request,
                     final HttpContext context) throws HttpException, IOException {
                 return new BasicAsyncRequestConsumer();
             }
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpAsyncExchange httpExchange,
@@ -203,14 +215,17 @@
 
         final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
 
+            @Override
             public void cancelled() {
                 latch.countDown();
             }
 
+            @Override
             public void failed(final Exception ex) {
                 latch.countDown();
             }
 
+            @Override
             public void completed(final HttpResponse response) {
                 Assert.fail();
             }
@@ -253,24 +268,29 @@
                 failed.set(true);
             }
 
+            @Override
             public void responseReceived(
                     final HttpResponse response) throws IOException, HttpException {
                 throw new IllegalStateException();
             }
 
+            @Override
             public void consumeContent(
                     final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
                 throw new IllegalStateException();
             }
 
+            @Override
             public void responseCompleted(final HttpContext context) {
                 throw new IllegalStateException();
             }
 
+            @Override
             public Exception getException() {
                 return null;
             }
 
+            @Override
             public String getResult() {
                 return null;
             }
@@ -330,21 +350,26 @@
             public void failed(final Exception ex) {
             }
 
+            @Override
             public void responseReceived(
                     final HttpResponse response) throws IOException, HttpException {
             }
 
+            @Override
             public void consumeContent(
                     final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
             }
 
+            @Override
             public void responseCompleted(final HttpContext context) {
             }
 
+            @Override
             public Exception getException() {
                 return null;
             }
 
+            @Override
             public String getResult() {
                 return null;
             }
diff --git a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java
index 48913ea..75341d4 100644
--- a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java
+++ b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java
@@ -105,6 +105,7 @@
             this.statuscode = statuscode;
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -134,6 +135,7 @@
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -158,6 +160,7 @@
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -183,6 +186,7 @@
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -215,6 +219,7 @@
             this.absolute = absolute;
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -247,6 +252,7 @@
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -331,6 +337,7 @@
     public void testBasicRedirect302NoLocation() throws Exception {
         this.serverBootstrap.registerHandler("*", new BasicAsyncRequestHandler(new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -699,6 +706,7 @@
             this.host = host;
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
diff --git a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java
index 83b3afc..5020073 100644
--- a/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java
+++ b/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java
@@ -65,6 +65,7 @@
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -81,6 +82,7 @@
 
         final UserTokenHandler userTokenHandler = new UserTokenHandler() {
 
+            @Override
             public Object getUserToken(final HttpContext context) {
                 return context.getAttribute("user");
             }
@@ -221,6 +223,7 @@
         // one to the same route.
         final UserTokenHandler userTokenHandler = new UserTokenHandler() {
 
+            @Override
             public Object getUserToken(final HttpContext context) {
                 return context.getAttribute("user");
             }
diff --git a/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java b/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
index 39107ab..7b7bb31 100644
--- a/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
+++ b/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
@@ -158,6 +158,7 @@
             this.forceChunking = forceChunking;
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,