hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1558077 [2/4] - in /httpcomponents/httpcore/trunk: httpcore-ab/src/main/java/org/apache/http/benchmark/ httpcore-ab/src/test/java/org/apache/http/benchmark/ httpcore-nio/src/main/java/org/apache/http/impl/nio/ httpcore-nio/src/main/java/or...
Date Tue, 14 Jan 2014 15:22:34 GMT
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java Tue Jan 14 15:22:31 2014
@@ -146,10 +146,12 @@ public class NStringEntity extends Abstr
         this(s, ContentType.DEFAULT_TEXT);
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
 
+    @Override
     public long getContentLength() {
         return this.b.length;
     }
@@ -159,6 +161,7 @@ public class NStringEntity extends Abstr
      *
      * @since 4.2
      */
+    @Override
     public void close() {
         this.buf.rewind();
     }
@@ -173,6 +176,7 @@ public class NStringEntity extends Abstr
         close();
     }
 
+    @Override
     public void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         encoder.write(this.buf);
@@ -181,14 +185,17 @@ public class NStringEntity extends Abstr
         }
     }
 
+    @Override
     public boolean isStreaming() {
         return false;
     }
 
+    @Override
     public InputStream getContent() {
         return new ByteArrayInputStream(this.b);
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         outstream.write(this.b);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java Tue Jan 14 15:22:31 2014
@@ -107,10 +107,12 @@ public abstract class AbstractNIOConnPoo
         this.connFactory = connFactory;
         this.addressResolver = new SocketAddressResolver<T>() {
 
+            @Override
             public SocketAddress resolveLocalAddress(final T route) throws IOException {
                 return AbstractNIOConnPool.this.resolveLocalAddress(route);
             }
 
+            @Override
             public SocketAddress resolveRemoteAddress(final T route) throws IOException {
                 return AbstractNIOConnPool.this.resolveRemoteAddress(route);
             }
@@ -277,6 +279,7 @@ public abstract class AbstractNIOConnPoo
         return future;
     }
 
+    @Override
     public Future<E> lease(final T route, final Object state, final FutureCallback<E> callback) {
         return lease(route, state, -1, TimeUnit.MICROSECONDS, callback);
     }
@@ -285,6 +288,7 @@ public abstract class AbstractNIOConnPoo
         return lease(route, state, -1, TimeUnit.MICROSECONDS, null);
     }
 
+    @Override
     public void release(final E entry, final boolean reusable) {
         if (entry == null) {
             return;
@@ -560,6 +564,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public void setMaxTotal(final int max) {
         Args.positive(max, "Max value");
         this.lock.lock();
@@ -570,6 +575,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public int getMaxTotal() {
         this.lock.lock();
         try {
@@ -579,6 +585,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public void setDefaultMaxPerRoute(final int max) {
         Args.positive(max, "Max value");
         this.lock.lock();
@@ -589,6 +596,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public int getDefaultMaxPerRoute() {
         this.lock.lock();
         try {
@@ -598,6 +606,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public void setMaxPerRoute(final T route, final int max) {
         Args.notNull(route, "Route");
         Args.positive(max, "Max value");
@@ -609,6 +618,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public int getMaxPerRoute(final T route) {
         Args.notNull(route, "Route");
         this.lock.lock();
@@ -619,6 +629,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public PoolStats getTotalStats() {
         this.lock.lock();
         try {
@@ -632,6 +643,7 @@ public abstract class AbstractNIOConnPoo
         }
     }
 
+    @Override
     public PoolStats getStats(final T route) {
         Args.notNull(route, "Route");
         this.lock.lock();
@@ -709,6 +721,7 @@ public abstract class AbstractNIOConnPoo
         final long deadline = System.currentTimeMillis() - time;
         enumAvailable(new PoolEntryCallback<T, C>() {
 
+            @Override
             public void process(final PoolEntry<T, C> entry) {
                 if (entry.getUpdated() <= deadline) {
                     entry.close();
@@ -723,6 +736,7 @@ public abstract class AbstractNIOConnPoo
         final long now = System.currentTimeMillis();
         enumAvailable(new PoolEntryCallback<T, C>() {
 
+            @Override
             public void process(final PoolEntry<T, C> entry) {
                 if (entry.isExpired(now)) {
                     entry.close();
@@ -748,18 +762,22 @@ public abstract class AbstractNIOConnPoo
 
     class InternalSessionRequestCallback implements SessionRequestCallback {
 
+        @Override
         public void completed(final SessionRequest request) {
             requestCompleted(request);
         }
 
+        @Override
         public void cancelled(final SessionRequest request) {
             requestCancelled(request);
         }
 
+        @Override
         public void failed(final SessionRequest request) {
             requestFailed(request);
         }
 
+        @Override
         public void timeout(final SessionRequest request) {
             requestTimeout(request);
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncRequestConsumer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncRequestConsumer.java Tue Jan 14 15:22:31 2014
@@ -122,6 +122,7 @@ public abstract class AbstractAsyncReque
     /**
      * Use {@link #onRequestReceived(HttpRequest)} instead.
      */
+    @Override
     public final synchronized void requestReceived(
             final HttpRequest request) throws HttpException, IOException {
         onRequestReceived(request);
@@ -137,6 +138,7 @@ public abstract class AbstractAsyncReque
     /**
      * Use {@link #onContentReceived(ContentDecoder, IOControl)} instead.
      */
+    @Override
     public final synchronized void consumeContent(
             final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
         onContentReceived(decoder, ioctrl);
@@ -145,6 +147,7 @@ public abstract class AbstractAsyncReque
     /**
      * Use {@link #buildResult(HttpContext)} instead.
      */
+    @Override
     public final synchronized void requestCompleted(final HttpContext context) {
         if (this.completed) {
             return;
@@ -159,6 +162,7 @@ public abstract class AbstractAsyncReque
         }
     }
 
+    @Override
     public final synchronized void failed(final Exception ex) {
         if (this.completed) {
             return;
@@ -168,6 +172,7 @@ public abstract class AbstractAsyncReque
         releaseResources();
     }
 
+    @Override
     public final synchronized void close() throws IOException {
         if (this.completed) {
             return;
@@ -177,14 +182,17 @@ public abstract class AbstractAsyncReque
         onClose();
     }
 
+    @Override
     public Exception getException() {
         return this.ex;
     }
 
+    @Override
     public T getResult() {
         return this.result;
     }
 
+    @Override
     public boolean isDone() {
         return this.completed;
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncResponseConsumer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncResponseConsumer.java Tue Jan 14 15:22:31 2014
@@ -120,6 +120,7 @@ public abstract class AbstractAsyncRespo
     /**
      * Use {@link #onResponseReceived(HttpResponse)} instead.
      */
+    @Override
     public final synchronized void responseReceived(
             final HttpResponse response) throws IOException, HttpException {
         onResponseReceived(response);
@@ -133,6 +134,7 @@ public abstract class AbstractAsyncRespo
     /**
      * Use {@link #onContentReceived(ContentDecoder, IOControl)} instead.
      */
+    @Override
     public final synchronized void consumeContent(
             final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
         onContentReceived(decoder, ioctrl);
@@ -141,6 +143,7 @@ public abstract class AbstractAsyncRespo
     /**
      * Use {@link #buildResult(HttpContext)} instead.
      */
+    @Override
     public final synchronized void responseCompleted(final HttpContext context) {
         if (this.completed) {
             return;
@@ -155,6 +158,7 @@ public abstract class AbstractAsyncRespo
         }
     }
 
+    @Override
     public final synchronized boolean cancel() {
         if (this.completed) {
             return false;
@@ -164,6 +168,7 @@ public abstract class AbstractAsyncRespo
         return true;
     }
 
+    @Override
     public final synchronized void failed(final Exception ex) {
         if (this.completed) {
             return;
@@ -173,6 +178,7 @@ public abstract class AbstractAsyncRespo
         releaseResources();
     }
 
+    @Override
     public final synchronized void close() throws IOException {
         if (this.completed) {
             return;
@@ -182,14 +188,17 @@ public abstract class AbstractAsyncRespo
         onClose();
     }
 
+    @Override
     public Exception getException() {
         return this.ex;
     }
 
+    @Override
     public T getResult() {
         return this.result;
     }
 
+    @Override
     public boolean isDone() {
         return this.completed;
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncClientExchangeHandler.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncClientExchangeHandler.java Tue Jan 14 15:22:31 2014
@@ -130,6 +130,7 @@ public class BasicAsyncClientExchangeHan
         }
     }
 
+    @Override
     public void close() throws IOException {
         releaseResources();
         if (!this.future.isDone()) {
@@ -137,6 +138,7 @@ public class BasicAsyncClientExchangeHan
         }
     }
 
+    @Override
     public HttpRequest generateRequest() throws IOException, HttpException {
         final HttpRequest request = this.requestProducer.generateRequest();
         this.localContext.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -145,16 +147,19 @@ public class BasicAsyncClientExchangeHan
         return request;
     }
 
+    @Override
     public void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         this.requestProducer.produceContent(encoder, ioctrl);
     }
 
+    @Override
     public void requestCompleted() {
         this.requestProducer.requestCompleted(this.localContext);
         this.requestSent = true;
     }
 
+    @Override
     public void responseReceived(final HttpResponse response) throws IOException, HttpException {
         this.localContext.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
         this.httppocessor.process(response, this.localContext);
@@ -162,11 +167,13 @@ public class BasicAsyncClientExchangeHan
         this.keepAlive = this.connReuseStrategy.keepAlive(response, this.localContext);
     }
 
+    @Override
     public void consumeContent(
             final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
         this.responseConsumer.consumeContent(decoder, ioctrl);
     }
 
+    @Override
     public void responseCompleted() throws IOException {
         try {
             if (!this.keepAlive) {
@@ -187,10 +194,12 @@ public class BasicAsyncClientExchangeHan
         }
     }
 
+    @Override
     public void inputTerminated() {
         failed(new ConnectionClosedException("Connection closed"));
     }
 
+    @Override
     public void failed(final Exception ex) {
         try {
             if (!this.requestSent) {
@@ -206,6 +215,7 @@ public class BasicAsyncClientExchangeHan
         }
     }
 
+    @Override
     public boolean cancel() {
         try {
             final boolean cancelled = this.responseConsumer.cancel();
@@ -218,6 +228,7 @@ public class BasicAsyncClientExchangeHan
         }
     }
 
+    @Override
     public boolean isDone() {
         return this.responseConsumer.isDone();
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java Tue Jan 14 15:22:31 2014
@@ -55,11 +55,13 @@ public class BasicAsyncRequestHandler im
         this.handler = handler;
     }
 
+    @Override
     public HttpAsyncRequestConsumer<HttpRequest> processRequest(final HttpRequest request,
             final HttpContext context) {
         return new BasicAsyncRequestConsumer();
     }
 
+    @Override
     public void handle(
             final HttpRequest request,
             final HttpAsyncExchange httpexchange,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java Tue Jan 14 15:22:31 2014
@@ -110,14 +110,17 @@ public class BasicAsyncRequestProducer i
         }
     }
 
+    @Override
     public synchronized HttpRequest generateRequest() {
         return this.request;
     }
 
+    @Override
     public HttpHost getTarget() {
         return this.target;
     }
 
+    @Override
     public synchronized void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         if (this.producer != null) {
@@ -128,22 +131,27 @@ public class BasicAsyncRequestProducer i
         }
     }
 
+    @Override
     public void requestCompleted(final HttpContext context) {
     }
 
+    @Override
     public void failed(final Exception ex) {
     }
 
+    @Override
     public synchronized boolean isRepeatable() {
         return this.producer == null || this.producer.isRepeatable();
     }
 
+    @Override
     public synchronized void resetRequest() throws IOException {
         if (this.producer != null) {
             this.producer.close();
         }
     }
 
+    @Override
     public synchronized void close() throws IOException {
         if (this.producer != null) {
             this.producer.close();

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java Tue Jan 14 15:22:31 2014
@@ -99,10 +99,12 @@ public class BasicAsyncResponseProducer 
         }
     }
 
+    @Override
     public synchronized HttpResponse generateResponse() {
         return this.response;
     }
 
+    @Override
     public synchronized void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         if (this.producer != null) {
@@ -113,12 +115,15 @@ public class BasicAsyncResponseProducer 
         }
     }
 
+    @Override
     public void responseCompleted(final HttpContext context) {
     }
 
+    @Override
     public void failed(final Exception ex) {
     }
 
+    @Override
     public synchronized void close() throws IOException {
         if (this.producer != null) {
             this.producer.close();

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java Tue Jan 14 15:22:31 2014
@@ -60,6 +60,7 @@ class ErrorResponseProducer implements H
         this.keepAlive = keepAlive;
     }
 
+    @Override
     public HttpResponse generateResponse() {
         if (this.keepAlive) {
             response.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE);
@@ -70,17 +71,21 @@ class ErrorResponseProducer implements H
         return response;
     }
 
+    @Override
     public void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         this.contentProducer.produceContent(encoder, ioctrl);
     }
 
+    @Override
     public void responseCompleted(final HttpContext context) {
     }
 
+    @Override
     public void failed(final Exception ex) {
     }
 
+    @Override
     public void close() throws IOException {
         this.contentProducer.close();
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java Tue Jan 14 15:22:31 2014
@@ -95,6 +95,7 @@ public class HttpAsyncRequestExecutor im
         this(DEFAULT_WAIT_FOR_CONTINUE);
     }
 
+    @Override
     public void connected(
             final NHttpClientConnection conn,
             final Object attachment) throws IOException, HttpException {
@@ -104,6 +105,7 @@ public class HttpAsyncRequestExecutor im
         requestReady(conn);
     }
 
+    @Override
     public void closed(final NHttpClientConnection conn) {
         final State state = getState(conn);
         final HttpAsyncClientExchangeHandler handler = getHandler(conn);
@@ -115,6 +117,7 @@ public class HttpAsyncRequestExecutor im
         }
     }
 
+    @Override
     public void exception(
             final NHttpClientConnection conn, final Exception cause) {
         shutdownConnection(conn);
@@ -126,6 +129,7 @@ public class HttpAsyncRequestExecutor im
         }
     }
 
+    @Override
     public void requestReady(
             final NHttpClientConnection conn) throws IOException, HttpException {
         final State state = ensureNotNull(getState(conn));
@@ -165,6 +169,7 @@ public class HttpAsyncRequestExecutor im
         }
     }
 
+    @Override
     public void outputReady(
             final NHttpClientConnection conn,
             final ContentEncoder encoder) throws IOException, HttpException {
@@ -182,6 +187,7 @@ public class HttpAsyncRequestExecutor im
         }
     }
 
+    @Override
     public void responseReceived(
             final NHttpClientConnection conn) throws HttpException, IOException {
         final State state = ensureNotNull(getState(conn));
@@ -228,6 +234,7 @@ public class HttpAsyncRequestExecutor im
         }
     }
 
+    @Override
     public void inputReady(
             final NHttpClientConnection conn,
             final ContentDecoder decoder) throws IOException, HttpException {
@@ -240,6 +247,7 @@ public class HttpAsyncRequestExecutor im
         }
     }
 
+    @Override
     public void endOfInput(final NHttpClientConnection conn) throws IOException {
         final State state = getState(conn);
         if (state != null) {
@@ -265,6 +273,7 @@ public class HttpAsyncRequestExecutor im
         conn.close();
     }
 
+    @Override
     public void timeout(
             final NHttpClientConnection conn) throws IOException {
         final State state = getState(conn);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java Tue Jan 14 15:22:31 2014
@@ -300,6 +300,7 @@ public class HttpAsyncRequester {
             this.context = context;
         }
 
+        @Override
         public void completed(final E result) {
             if (this.requestFuture.isDone()) {
                 this.connPool.release(result, true);
@@ -313,6 +314,7 @@ public class HttpAsyncRequester {
             initExection(handler, conn);
         }
 
+        @Override
         public void failed(final Exception ex) {
             try {
                 try {
@@ -325,6 +327,7 @@ public class HttpAsyncRequester {
             }
         }
 
+        @Override
         public void cancelled() {
             try {
                 try {
@@ -369,6 +372,7 @@ public class HttpAsyncRequester {
             this.connPool = connPool;
         }
 
+        @Override
         public void completed(final T result) {
             try {
                 this.connPool.release(this.poolEntry, true);
@@ -377,6 +381,7 @@ public class HttpAsyncRequester {
             }
         }
 
+        @Override
         public void failed(final Exception ex) {
             try {
                 this.connPool.release(this.poolEntry, false);
@@ -385,6 +390,7 @@ public class HttpAsyncRequester {
             }
         }
 
+        @Override
         public void cancelled() {
             try {
                 this.connPool.release(this.poolEntry, false);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java Tue Jan 14 15:22:31 2014
@@ -201,11 +201,13 @@ public class HttpAsyncService implements
         this(httpProcessor, null, null, handlerMapper, null);
     }
 
+    @Override
     public void connected(final NHttpServerConnection conn) {
         final State state = new State();
         conn.getContext().setAttribute(HTTP_EXCHANGE_STATE, state);
     }
 
+    @Override
     public void closed(final NHttpServerConnection conn) {
         final State state = getState(conn);
         if (state != null) {
@@ -219,6 +221,7 @@ public class HttpAsyncService implements
         }
     }
 
+    @Override
     public void exception(
             final NHttpServerConnection conn, final Exception cause) {
         final State state = ensureNotNull(getState(conn));
@@ -264,6 +267,7 @@ public class HttpAsyncService implements
         }
     }
 
+    @Override
     public void requestReceived(
             final NHttpServerConnection conn) throws IOException, HttpException {
         final State state = ensureNotNull(getState(conn));
@@ -309,6 +313,7 @@ public class HttpAsyncService implements
         }
     }
 
+    @Override
     public void inputReady(
             final NHttpServerConnection conn,
             final ContentDecoder decoder) throws IOException, HttpException {
@@ -321,6 +326,7 @@ public class HttpAsyncService implements
         }
     }
 
+    @Override
     public void responseReady(
             final NHttpServerConnection conn) throws IOException, HttpException {
         final State state = ensureNotNull(getState(conn));
@@ -365,6 +371,7 @@ public class HttpAsyncService implements
         }
     }
 
+    @Override
     public void outputReady(
             final NHttpServerConnection conn,
             final ContentEncoder encoder) throws IOException {
@@ -387,6 +394,7 @@ public class HttpAsyncService implements
         }
     }
 
+    @Override
     public void endOfInput(final NHttpServerConnection conn) throws IOException {
         // Closing connection in an orderly manner and
         // waiting for output buffer to get flushed.
@@ -398,6 +406,7 @@ public class HttpAsyncService implements
         conn.close();
     }
 
+    @Override
     public void timeout(final NHttpServerConnection conn) throws IOException {
         final State state = getState(conn);
         if (state != null) {
@@ -758,14 +767,17 @@ public class HttpAsyncService implements
             this.conn = conn;
         }
 
+        @Override
         public HttpRequest getRequest() {
             return this.request;
         }
 
+        @Override
         public HttpResponse getResponse() {
             return this.response;
         }
 
+        @Override
         public void setCallback(final Cancellable cancellable) {
             synchronized (this) {
                 Asserts.check(!this.completed, "Response already submitted");
@@ -778,6 +790,7 @@ public class HttpAsyncService implements
             }
         }
 
+        @Override
         public void submitResponse(final HttpAsyncResponseProducer responseProducer) {
             Args.notNull(responseProducer, "Response producer");
             synchronized (this) {
@@ -796,18 +809,22 @@ public class HttpAsyncService implements
             }
         }
 
+        @Override
         public void submitResponse() {
             submitResponse(new BasicAsyncResponseProducer(this.response));
         }
 
+        @Override
         public boolean isCompleted() {
             return this.completed;
         }
 
+        @Override
         public void setTimeout(final int timeout) {
             this.conn.setSocketTimeout(timeout);
         }
 
+        @Override
         public int getTimeout() {
             return this.conn.getSocketTimeout();
         }
@@ -826,6 +843,7 @@ public class HttpAsyncService implements
             this.resolver = resolver;
         }
 
+        @Override
         public HttpAsyncRequestHandler<?> lookup(final HttpRequest request) {
             return resolver.lookup(request.getRequestLine().getUri());
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java Tue Jan 14 15:22:31 2014
@@ -45,9 +45,11 @@ class NullRequestConsumer implements Htt
         this.buffer = ByteBuffer.allocate(2048);
     }
 
+    @Override
     public void requestReceived(final HttpRequest request) {
     }
 
+    @Override
     public void consumeContent(
             final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
         int lastRead;
@@ -57,26 +59,32 @@ class NullRequestConsumer implements Htt
         } while (lastRead > 0);
     }
 
+    @Override
     public void requestCompleted(final HttpContext context) {
         this.completed = true;
     }
 
+    @Override
     public void failed(final Exception ex) {
         this.completed = true;
     }
 
+    @Override
     public Object getResult() {
         return Boolean.valueOf(this.completed);
     }
 
+    @Override
     public Exception getException() {
         return null;
     }
 
+    @Override
     public void close() throws IOException {
         this.completed = true;
     }
 
+    @Override
     public boolean isDone() {
         return this.completed;
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestHandler.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestHandler.java Tue Jan 14 15:22:31 2014
@@ -40,11 +40,13 @@ class NullRequestHandler implements Http
         super();
     }
 
+    @Override
     public HttpAsyncRequestConsumer<Object> processRequest(
             final HttpRequest request, final HttpContext context) {
         return new NullRequestConsumer();
     }
 
+    @Override
     public void handle(
             final Object obj,
             final HttpAsyncExchange httpexchange,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java Tue Jan 14 15:22:31 2014
@@ -105,6 +105,7 @@ public class UriHttpAsyncRequestHandlerM
      * @param request the request
      * @return handler or <code>null</code> if no match is found.
      */
+    @Override
     public HttpAsyncRequestHandler<?> lookup(final HttpRequest request) {
         return matcher.lookup(getRequestPath(request));
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java Tue Jan 14 15:22:31 2014
@@ -485,6 +485,7 @@ public class SSLIOSession implements IOS
         }
     }
 
+    @Override
     public synchronized void close() {
         if (this.status >= CLOSING) {
             return;
@@ -494,6 +495,7 @@ public class SSLIOSession implements IOS
         updateEventMask();
     }
 
+    @Override
     public synchronized void shutdown() {
         if (this.status == CLOSED) {
             return;
@@ -502,77 +504,94 @@ public class SSLIOSession implements IOS
         this.session.shutdown();
     }
 
+    @Override
     public int getStatus() {
         return this.status;
     }
 
+    @Override
     public boolean isClosed() {
         return this.status >= CLOSING || this.session.isClosed();
     }
 
+    @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 synchronized int getEventMask() {
         return this.appEventMask;
     }
 
+    @Override
     public synchronized void setEventMask(final int ops) {
         this.appEventMask = ops;
         updateEventMask();
     }
 
+    @Override
     public synchronized void setEvent(final int op) {
         this.appEventMask = this.appEventMask | op;
         updateEventMask();
     }
 
+    @Override
     public synchronized void clearEvent(final int op) {
         this.appEventMask = this.appEventMask & ~op;
         updateEventMask();
     }
 
+    @Override
     public int getSocketTimeout() {
         return this.session.getSocketTimeout();
     }
 
+    @Override
     public void setSocketTimeout(final int timeout) {
         this.session.setSocketTimeout(timeout);
     }
 
+    @Override
     public synchronized boolean hasBufferedInput() {
         return (this.appBufferStatus != null && this.appBufferStatus.hasBufferedInput())
             || this.inEncrypted.position() > 0
             || this.inPlain.position() > 0;
     }
 
+    @Override
     public synchronized boolean hasBufferedOutput() {
         return (this.appBufferStatus != null && this.appBufferStatus.hasBufferedOutput())
             || this.outEncrypted.position() > 0
             || this.outPlain.position() > 0;
     }
 
+    @Override
     public synchronized void setBufferStatus(final SessionBufferStatus status) {
         this.appBufferStatus = status;
     }
 
+    @Override
     public Object getAttribute(final String name) {
         return this.session.getAttribute(name);
     }
 
+    @Override
     public Object removeAttribute(final String name) {
         return this.session.removeAttribute(name);
     }
 
+    @Override
     public void setAttribute(final String name, final Object obj) {
         this.session.setAttribute(name, obj);
     }
@@ -627,6 +646,7 @@ public class SSLIOSession implements IOS
         return buffer.toString();
     }
 
+    @Override
     public Socket getSocket(){
         if (this.session instanceof SocketAccessor){
             return ((SocketAccessor) this.session).getSocket();
@@ -637,18 +657,22 @@ public class SSLIOSession implements IOS
 
     private class InternalByteChannel implements ByteChannel {
 
+        @Override
         public int write(final ByteBuffer src) throws IOException {
             return SSLIOSession.this.writePlain(src);
         }
 
+        @Override
         public int read(final ByteBuffer dst) throws IOException {
             return SSLIOSession.this.readPlain(dst);
         }
 
+        @Override
         public void close() throws IOException {
             SSLIOSession.this.close();
         }
 
+        @Override
         public boolean isOpen() {
             return !SSLIOSession.this.isClosed();
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/DirectByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/DirectByteBufferAllocator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/DirectByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/DirectByteBufferAllocator.java Tue Jan 14 15:22:31 2014
@@ -46,6 +46,7 @@ public class DirectByteBufferAllocator i
         super();
     }
 
+    @Override
     public ByteBuffer allocate(final int size) {
         return ByteBuffer.allocateDirect(size);
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java Tue Jan 14 15:22:31 2014
@@ -137,6 +137,7 @@ public class ExpandableBuffer implements
      *
      * @return total capacity.
      */
+    @Override
     public int capacity() {
         return this.buffer.capacity();
     }
@@ -157,6 +158,7 @@ public class ExpandableBuffer implements
      *
      * @return buffer length.
      */
+    @Override
     public int length() {
         setOutputMode();
         return this.buffer.remaining();
@@ -167,6 +169,7 @@ public class ExpandableBuffer implements
      *
      * @return buffer length.
      */
+    @Override
     public int available() {
         setInputMode();
         return this.buffer.remaining();

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/HeapByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/HeapByteBufferAllocator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/HeapByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/HeapByteBufferAllocator.java Tue Jan 14 15:22:31 2014
@@ -46,6 +46,7 @@ public class HeapByteBufferAllocator imp
         super();
     }
 
+    @Override
     public ByteBuffer allocate(final int size) {
         return ByteBuffer.allocate(size);
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java Tue Jan 14 15:22:31 2014
@@ -88,6 +88,7 @@ public class SharedInputBuffer extends E
         this(buffersize, HeapByteBufferAllocator.INSTANCE);
     }
 
+    @Override
     public void reset() {
         if (this.shutdown) {
             return;
@@ -104,6 +105,7 @@ public class SharedInputBuffer extends E
     /**
      * @deprecated (4.3) use {@link #consumeContent(ContentDecoder, IOControl)}
      */
+    @Override
     @Deprecated
     public int consumeContent(final ContentDecoder decoder) throws IOException {
         return consumeContent(decoder, null);
@@ -246,6 +248,7 @@ public class SharedInputBuffer extends E
         return this.shutdown || (!hasData() && this.endOfStream);
     }
 
+    @Override
     public int read() throws IOException {
         if (this.shutdown) {
             return -1;
@@ -264,6 +267,7 @@ public class SharedInputBuffer extends E
         }
     }
 
+    @Override
     public int read(final byte[] b, final int off, final int len) throws IOException {
         if (this.shutdown) {
             return -1;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java Tue Jan 14 15:22:31 2014
@@ -91,6 +91,7 @@ public class SharedOutputBuffer extends 
         this(buffersize, HeapByteBufferAllocator.INSTANCE);
     }
 
+    @Override
     public void reset() {
         if (this.shutdown) {
             return;
@@ -147,6 +148,7 @@ public class SharedOutputBuffer extends 
     /**
      * @deprecated (4.3) use {@link #produceContent(ContentEncoder, IOControl)}
      */
+    @Override
     @Deprecated
     public int produceContent(final ContentEncoder encoder) throws IOException {
         return produceContent(encoder, null);
@@ -209,6 +211,7 @@ public class SharedOutputBuffer extends 
         }
     }
 
+    @Override
     public void write(final byte[] b, final int off, final int len) throws IOException {
         if (b == null) {
             return;
@@ -241,6 +244,7 @@ public class SharedOutputBuffer extends 
         write(b, 0, b.length);
     }
 
+    @Override
     public void write(final int b) throws IOException {
         this.lock.lock();
         try {
@@ -256,6 +260,7 @@ public class SharedOutputBuffer extends 
         }
     }
 
+    @Override
     public void flush() throws IOException {
     }
 
@@ -280,6 +285,7 @@ public class SharedOutputBuffer extends 
         }
     }
 
+    @Override
     public void writeCompleted() throws IOException {
         this.lock.lock();
         try {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java Tue Jan 14 15:22:31 2014
@@ -54,11 +54,13 @@ public class SimpleInputBuffer extends E
         this(buffersize, HeapByteBufferAllocator.INSTANCE);
     }
 
+    @Override
     public void reset() {
         this.endOfStream = false;
         super.clear();
     }
 
+    @Override
     public int consumeContent(final ContentDecoder decoder) throws IOException {
         setInputMode();
         int totalRead = 0;
@@ -84,6 +86,7 @@ public class SimpleInputBuffer extends E
         return !hasData() && this.endOfStream;
     }
 
+    @Override
     public int read() throws IOException {
         if (isEndOfStream()) {
             return -1;
@@ -92,6 +95,7 @@ public class SimpleInputBuffer extends E
         return this.buffer.get() & 0xff;
     }
 
+    @Override
     public int read(final byte[] b, final int off, final int len) throws IOException {
         if (isEndOfStream()) {
             return -1;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java Tue Jan 14 15:22:31 2014
@@ -55,6 +55,7 @@ public class SimpleOutputBuffer extends 
         this(buffersize, HeapByteBufferAllocator.INSTANCE);
     }
 
+    @Override
     public int produceContent(final ContentEncoder encoder) throws IOException {
         setOutputMode();
         final int bytesWritten = encoder.write(this.buffer);
@@ -64,6 +65,7 @@ public class SimpleOutputBuffer extends 
         return bytesWritten;
     }
 
+    @Override
     public void write(final byte[] b, final int off, final int len) throws IOException {
         if (b == null) {
             return;
@@ -86,6 +88,7 @@ public class SimpleOutputBuffer extends 
         write(b, 0, b.length);
     }
 
+    @Override
     public void write(final int b) throws IOException {
         if (this.endOfStream) {
             return;
@@ -95,14 +98,17 @@ public class SimpleOutputBuffer extends 
         this.buffer.put((byte)b);
     }
 
+    @Override
     public void reset() {
         super.clear();
         this.endOfStream = false;
     }
 
+    @Override
     public void flush() {
     }
 
+    @Override
     public void writeCompleted() {
         this.endOfStream = true;
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ByteChannelMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ByteChannelMock.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ByteChannelMock.java Tue Jan 14 15:22:31 2014
@@ -45,18 +45,22 @@ public class ByteChannelMock implements 
         this.writableChannel = writableChannel;
     }
 
+    @Override
     public int read(final ByteBuffer dst) throws IOException {
         return this.readableChannel.read(dst);
     }
 
+    @Override
     public int write(final ByteBuffer src) throws IOException {
         return this.writableChannel.write(src);
     }
 
+    @Override
     public boolean isOpen() {
         return !this.closed;
     }
 
+    @Override
     public void close() throws IOException {
         if (this.closed) {
             return;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ReadableByteChannelMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ReadableByteChannelMock.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ReadableByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ReadableByteChannelMock.java Tue Jan 14 15:22:31 2014
@@ -64,6 +64,7 @@ public class ReadableByteChannelMock imp
         }
     }
 
+    @Override
     public int read(final ByteBuffer dst) throws IOException {
         if (this.closed) {
             throw new ClosedChannelException();
@@ -80,10 +81,12 @@ public class ReadableByteChannelMock imp
         return i;
     }
 
+    @Override
     public void close() throws IOException {
         this.closed = true;
     }
 
+    @Override
     public boolean isOpen() {
         return !this.closed && !this.eof;
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/WritableByteChannelMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/WritableByteChannelMock.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/WritableByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/WritableByteChannelMock.java Tue Jan 14 15:22:31 2014
@@ -127,6 +127,7 @@ public class WritableByteChannelMock imp
         this(size, 0);
     }
 
+    @Override
     public int write(final ByteBuffer src) throws IOException {
         if (this.closed) {
             throw new ClosedChannelException();
@@ -134,10 +135,12 @@ public class WritableByteChannelMock imp
         return this.buf.write(src);
     }
 
+    @Override
     public boolean isOpen() {
         return !this.closed;
     }
 
+    @Override
     public void close() throws IOException {
         this.closed = true;
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java Tue Jan 14 15:22:31 2014
@@ -138,6 +138,7 @@ public class TestDefaultNHttpClientConne
             this.request = request;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final NHttpClientConnection conn = (NHttpClientConnection) args[0];
@@ -155,6 +156,7 @@ public class TestDefaultNHttpClientConne
             this.contentProducer = contentProducer;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final IOControl ioctrl = (IOControl) args[0];
@@ -420,6 +422,7 @@ public class TestDefaultNHttpClientConne
             this.responses = responses;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final NHttpClientConnection conn = (NHttpClientConnection) args[0];
@@ -443,6 +446,7 @@ public class TestDefaultNHttpClientConne
             this.buf = buf;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final ContentDecoder decoder = (ContentDecoder) args[1];

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java Tue Jan 14 15:22:31 2014
@@ -138,6 +138,7 @@ public class TestDefaultNHttpServerConne
             this.response = response;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final NHttpServerConnection conn = (NHttpServerConnection) args[0];
@@ -155,6 +156,7 @@ public class TestDefaultNHttpServerConne
             this.contentProducer = contentProducer;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final IOControl ioctrl = (IOControl) args[0];
@@ -420,6 +422,7 @@ public class TestDefaultNHttpServerConne
             this.requests = requests;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final NHttpServerConnection conn = (NHttpServerConnection) args[0];
@@ -443,6 +446,7 @@ public class TestDefaultNHttpServerConne
             this.buf = buf;
         }
 
+        @Override
         public Void answer(final InvocationOnMock invocation) throws Throwable {
             final Object[] args = invocation.getArguments();
             final ContentDecoder decoder = (ContentDecoder) args[1];

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java Tue Jan 14 15:22:31 2014
@@ -178,6 +178,7 @@ public class TestDefaultIOReactors exten
 
         final HttpRequestHandler requestHandler = new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -241,6 +242,7 @@ public class TestDefaultIOReactors exten
 
         final HttpRequestHandler requestHandler = new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -252,10 +254,12 @@ public class TestDefaultIOReactors exten
 
         final IOReactorExceptionHandler exceptionHandler = new IOReactorExceptionHandler() {
 
+            @Override
             public boolean handle(final IOException ex) {
                 return false;
             }
 
+            @Override
             public boolean handle(final RuntimeException ex) {
                 requestConns.countDown();
                 return false;
@@ -318,6 +322,7 @@ public class TestDefaultIOReactors exten
 
         final HttpRequestHandler requestHandler = new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -329,10 +334,12 @@ public class TestDefaultIOReactors exten
 
         final IOReactorExceptionHandler exceptionHandler = new IOReactorExceptionHandler() {
 
+            @Override
             public boolean handle(final IOException ex) {
                 return false;
             }
 
+            @Override
             public boolean handle(final RuntimeException ex) {
                 requestConns.countDown();
                 return true;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java Tue Jan 14 15:22:31 2014
@@ -78,6 +78,7 @@ public class TestDefaultListeningIOReact
 
         final Thread t = new Thread(new Runnable() {
 
+            @Override
             public void run() {
                 try {
                     ioreactor.execute(eventDispatch);
@@ -130,6 +131,7 @@ public class TestDefaultListeningIOReact
 
         final Thread t = new Thread(new Runnable() {
 
+            @Override
             public void run() {
                 try {
                     ioreactor.execute(eventDispatch);
@@ -173,10 +175,12 @@ public class TestDefaultListeningIOReact
 
         ioreactor.setExceptionHandler(new IOReactorExceptionHandler() {
 
+            @Override
             public boolean handle(final IOException ex) {
                 return (ex instanceof BindException);
             }
 
+            @Override
             public boolean handle(final RuntimeException ex) {
                 return false;
             }
@@ -185,6 +189,7 @@ public class TestDefaultListeningIOReact
 
         final Thread t = new Thread(new Runnable() {
 
+            @Override
             public void run() {
                 try {
                     ioreactor.execute(eventDispatch);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/SimpleRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/SimpleRequestHandler.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/SimpleRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/SimpleRequestHandler.java Tue Jan 14 15:22:31 2014
@@ -54,6 +54,7 @@ final class SimpleRequestHandler impleme
         this.chunking = chunking;
     }
 
+    @Override
     public void handle(
             final HttpRequest request,
             final HttpResponse response,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java Tue Jan 14 15:22:31 2014
@@ -86,10 +86,12 @@ public class TestCustomSSL {
     public void testCustomSSLContext() throws Exception {
         final SSLSetupHandler sslSetupHandler = new SSLSetupHandler() {
 
+            @Override
             public void initalize(
                     final SSLEngine sslengine) throws SSLException {
             }
 
+            @Override
             public void verify(
                     final IOSession iosession, final SSLSession sslsession) throws SSLException {
                 final BigInteger sslid = new BigInteger(sslsession.getId());
@@ -100,6 +102,7 @@ public class TestCustomSSL {
 
         final HttpRequestHandler requestHandler = new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java Tue Jan 14 15:22:31 2014
@@ -94,6 +94,7 @@ public class TestHttpAsyncHandlerCancell
         final CountDownLatch latch = new CountDownLatch(1);
         final HttpAsyncResponseProducer responseProducer = new HttpAsyncResponseProducer() {
 
+            @Override
             public HttpResponse generateResponse() {
                 final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
                 final BasicHttpEntity entity = new BasicHttpEntity();
@@ -103,19 +104,23 @@ public class TestHttpAsyncHandlerCancell
                 return response;
             }
 
+            @Override
             public void close() throws IOException {
                 latch.countDown();
             }
 
+            @Override
             public void responseCompleted(final HttpContext context) {
             }
 
+            @Override
             public void produceContent(
                     final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
                 // suspend output
                 ioctrl.suspendOutput();
             }
 
+            @Override
             public void failed(final Exception ex) {
             }
 
@@ -124,12 +129,14 @@ public class TestHttpAsyncHandlerCancell
         final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
         registry.register("*", 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 data,
                     final HttpAsyncExchange httpExchange,
@@ -171,6 +178,7 @@ public class TestHttpAsyncHandlerCancell
         final CountDownLatch latch = new CountDownLatch(1);
         final Cancellable cancellable = new Cancellable() {
 
+            @Override
             public boolean cancel() {
                 latch.countDown();
                 return true;
@@ -180,12 +188,14 @@ public class TestHttpAsyncHandlerCancell
         final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
         registry.register("*", 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 data,
                     final HttpAsyncExchange httpExchange,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java Tue Jan 14 15:22:31 2014
@@ -369,6 +369,7 @@ public class TestHttpAsyncHandlers exten
         final HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
                 new HttpRequestInterceptor() {
 
+                    @Override
                     public void process(
                             final HttpRequest request,
                             final HttpContext context) throws HttpException, IOException {
@@ -441,6 +442,7 @@ public class TestHttpAsyncHandlers exten
     public void testHttpPostsWithExpectationVerification() throws Exception {
         final HttpAsyncExpectationVerifier expectationVerifier = new HttpAsyncExpectationVerifier() {
 
+            @Override
             public void verify(
                     final HttpAsyncExchange httpexchange,
                     final HttpContext context) throws HttpException {
@@ -512,12 +514,14 @@ public class TestHttpAsyncHandlers exten
                 this.requestHandler = new SimpleRequestHandler();
             }
 
+            @Override
             public HttpAsyncRequestConsumer<HttpRequest> processRequest(
                     final HttpRequest request,
                     final HttpContext context) {
                 return new BasicAsyncRequestConsumer();
             }
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpAsyncExchange httpexchange,
@@ -576,6 +580,7 @@ public class TestHttpAsyncHandlers exten
     public void testHttpPostsWithExpectationVerificationDelayedResponse() throws Exception {
         final HttpAsyncExpectationVerifier expectationVerifier = new HttpAsyncExpectationVerifier() {
 
+            @Override
             public void verify(
                     final HttpAsyncExchange httpexchange,
                     final HttpContext context) throws HttpException {
@@ -652,12 +657,14 @@ public class TestHttpAsyncHandlers exten
                 super();
             }
 
+            @Override
             public HttpAsyncRequestConsumer<HttpRequest> processRequest(
                     final HttpRequest request,
                     final HttpContext context) {
                 return new BasicAsyncRequestConsumer();
             }
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpAsyncExchange httpexchange,
@@ -727,6 +734,7 @@ public class TestHttpAsyncHandlers exten
         final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
         registry.register("*", new BasicAsyncRequestHandler(new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java Tue Jan 14 15:22:31 2014
@@ -112,6 +112,7 @@ public class TestHttpAsyncPrematureTermi
         final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
         registry.register("*", new HttpAsyncRequestHandler<HttpRequest>() {
 
+            @Override
             public HttpAsyncRequestConsumer<HttpRequest> processRequest(
                     final HttpRequest request,
                     final HttpContext context) throws HttpException, IOException {
@@ -121,6 +122,7 @@ public class TestHttpAsyncPrematureTermi
                 return new BasicAsyncRequestConsumer();
             }
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpAsyncExchange httpExchange,
@@ -138,14 +140,17 @@ public class TestHttpAsyncPrematureTermi
 
         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();
             }
@@ -173,12 +178,14 @@ public class TestHttpAsyncPrematureTermi
         };
         registry.register("*", 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,
@@ -199,14 +206,17 @@ public class TestHttpAsyncPrematureTermi
 
         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();
             }
@@ -226,12 +236,14 @@ public class TestHttpAsyncPrematureTermi
         final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
         registry.register("*", 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,
@@ -258,14 +270,17 @@ public class TestHttpAsyncPrematureTermi
 
         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();
             }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncTimeout.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncTimeout.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncTimeout.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncTimeout.java Tue Jan 14 15:22:31 2014
@@ -115,14 +115,17 @@ public class TestHttpsAsyncTimeout exten
 
         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();
             }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java Tue Jan 14 15:22:31 2014
@@ -110,6 +110,7 @@ public class TestPipelining extends Http
         final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
         registry.register("*", new BasicAsyncRequestHandler(new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -187,6 +188,7 @@ public class TestPipelining extends Http
         final CountDownLatch latch = new CountDownLatch(1);
         final Cancellable cancellable = new Cancellable() {
 
+            @Override
             public boolean cancel() {
                 latch.countDown();
                 return true;
@@ -196,11 +198,13 @@ public class TestPipelining extends Http
         final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
         registry.register("/long", new HttpAsyncRequestHandler<HttpRequest>() {
 
+            @Override
             public HttpAsyncRequestConsumer<HttpRequest> processRequest(final HttpRequest request,
                     final HttpContext context) {
                 return new BasicAsyncRequestConsumer();
             }
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpAsyncExchange httpexchange,
@@ -212,6 +216,7 @@ public class TestPipelining extends Http
         });
         registry.register("/short", new BasicAsyncRequestHandler(new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java Tue Jan 14 15:22:31 2014
@@ -122,6 +122,7 @@ public class TestTruncatedChunks extends
             super.complete();
         }
 
+        @Override
         public int write(final ByteBuffer src) throws IOException {
             int chunk;
             if (!this.done) {
@@ -152,6 +153,7 @@ public class TestTruncatedChunks extends
             super();
         }
 
+        @Override
         public DefaultNHttpServerConnection createConnection(final IOSession session) {
             return new LoggingNHttpServerConnection(session) {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java Tue Jan 14 15:22:31 2014
@@ -74,6 +74,7 @@ public class TestNIOConnPool {
 
     static class LocalConnFactory implements NIOConnFactory<String, IOSession> {
 
+        @Override
         public IOSession create(final String route, final IOSession session) throws IOException {
             return session;
         }
@@ -82,10 +83,12 @@ public class TestNIOConnPool {
 
     static class LocalAddressResolver implements SocketAddressResolver<String> {
 
+        @Override
         public SocketAddress resolveLocalAddress(final String route) {
             return null;
         }
 
+        @Override
         public SocketAddress resolveRemoteAddress(final String route) {
             return InetSocketAddress.createUnresolved(route, 80);
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java Tue Jan 14 15:22:31 2014
@@ -96,6 +96,7 @@ public class HttpClientNio {
         this.ioReactor = new DefaultConnectingIOReactor();
         this.connpool = new BasicNIOConnPool(this.ioReactor, new NIOConnFactory<HttpHost, NHttpClientConnection>() {
 
+            @Override
             public NHttpClientConnection create(
                 final HttpHost route, final IOSession session) throws IOException {
                 final NHttpClientConnection conn = connFactory.create(route, session);
@@ -142,6 +143,7 @@ public class HttpClientNio {
         this.connpool.lease(target, null, this.timeout, TimeUnit.MILLISECONDS,
             new FutureCallback<BasicNIOPoolEntry>() {
 
+                @Override
                 public void completed(final BasicNIOPoolEntry result) {
                     executor.execute(
                             requestProducer, responseConsumer,
@@ -149,14 +151,17 @@ public class HttpClientNio {
                             context != null ? context : new BasicHttpContext(),
                             new FutureCallback<T>() {
 
+                                @Override
                                 public void completed(final T result) {
                                     future.completed(result);
                                 }
 
+                                @Override
                                 public void failed(final Exception ex) {
                                     future.failed(ex);
                                 }
 
+                                @Override
                                 public void cancelled() {
                                     future.cancel();
                                 }
@@ -164,10 +169,12 @@ public class HttpClientNio {
                             });
                 }
 
+                @Override
                 public void failed(final Exception ex) {
                     future.failed(ex);
                 }
 
+                @Override
                 public void cancelled() {
                     future.cancel();
                 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -36,6 +36,7 @@ public class LoggingClientConnectionFact
         super();
     }
 
+    @Override
     public DefaultNHttpClientConnection createConnection(final IOSession session) {
         return new LoggingNHttpClientConnection(session);
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java Tue Jan 14 15:22:31 2014
@@ -59,18 +59,22 @@ public class LoggingIOSession implements
         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();
     }
@@ -94,6 +98,7 @@ public class LoggingIOSession implements
         return buffer.toString();
     }
 
+    @Override
     public void setEventMask(final int ops) {
         this.session.setEventMask(ops);
         if (this.log.isDebugEnabled()) {
@@ -101,6 +106,7 @@ public class LoggingIOSession implements
         }
     }
 
+    @Override
     public void setEvent(final int op) {
         this.session.setEvent(op);
         if (this.log.isDebugEnabled()) {
@@ -108,6 +114,7 @@ public class LoggingIOSession implements
         }
     }
 
+    @Override
     public void clearEvent(final int op) {
         this.session.clearEvent(op);
         if (this.log.isDebugEnabled()) {
@@ -115,6 +122,7 @@ public class LoggingIOSession implements
         }
     }
 
+    @Override
     public void close() {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + " " + this.session + ": Close");
@@ -122,14 +130,17 @@ public class LoggingIOSession implements
         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");
@@ -137,10 +148,12 @@ public class LoggingIOSession implements
         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);
@@ -148,22 +161,27 @@ public class LoggingIOSession implements
         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);
@@ -171,6 +189,7 @@ public class LoggingIOSession implements
         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);
@@ -185,6 +204,7 @@ public class LoggingIOSession implements
 
     class LoggingByteChannel implements ByteChannel {
 
+        @Override
         public int read(final ByteBuffer dst) throws IOException {
             final int bytesRead = session.channel().read(dst);
             if (log.isDebugEnabled()) {
@@ -200,6 +220,7 @@ public class LoggingIOSession implements
             return bytesRead;
         }
 
+        @Override
         public int write(final ByteBuffer src) throws IOException {
             final int byteWritten = session.channel().write(src);
             if (log.isDebugEnabled()) {
@@ -215,6 +236,7 @@ public class LoggingIOSession implements
             return byteWritten;
         }
 
+        @Override
         public void close() throws IOException {
             if (log.isDebugEnabled()) {
                 log.debug(id + " " + session + ": Channel close");
@@ -222,6 +244,7 @@ public class LoggingIOSession implements
             session.channel().close();
         }
 
+        @Override
         public boolean isOpen() {
             return session.channel().isOpen();
         }



Mime
View raw message