hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1750003 - in /httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main: java-deprecated/org/apache/http/impl/nio/ java-deprecated/org/apache/http/impl/nio/reactor/ java-deprecated/org/apache/http/nio/entity/ java-deprecated/org/apache/...
Date Thu, 23 Jun 2016 20:09:53 GMT
Author: ggregory
Date: Thu Jun 23 20:09:52 2016
New Revision: 1750003

URL: http://svn.apache.org/viewvc?rev=1750003&view=rev
Log:
Add missing '@Override' annotations.

Modified:
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
    httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
Thu Jun 23 20:09:52 2016
@@ -173,6 +173,7 @@ public class SSLClientIOEventDispatch im
         return new SSLIOSession(session, sslcontext, sslHandler);
     }
 
+    @Override
     public void connected(final IOSession session) {
 
         final SSLIOSession sslSession = createSSLIOSession(
@@ -197,6 +198,7 @@ public class SSLClientIOEventDispatch im
         }
     }
 
+    @Override
     public void disconnected(final IOSession session) {
         final NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
@@ -205,6 +207,7 @@ public class SSLClientIOEventDispatch im
         }
     }
 
+    @Override
     public void inputReady(final IOSession session) {
         final NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
@@ -222,6 +225,7 @@ public class SSLClientIOEventDispatch im
         }
     }
 
+    @Override
     public void outputReady(final IOSession session) {
         final NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
@@ -239,6 +243,7 @@ public class SSLClientIOEventDispatch im
         }
     }
 
+    @Override
     public void timeout(final IOSession session) {
         final NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
Thu Jun 23 20:09:52 2016
@@ -173,6 +173,7 @@ public class SSLServerIOEventDispatch im
         return new SSLIOSession(session, sslcontext, sslHandler);
     }
 
+    @Override
     public void connected(final IOSession session) {
 
         final SSLIOSession sslSession = createSSLIOSession(
@@ -196,6 +197,7 @@ public class SSLServerIOEventDispatch im
         }
     }
 
+    @Override
     public void disconnected(final IOSession session) {
         final NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
@@ -205,6 +207,7 @@ public class SSLServerIOEventDispatch im
         }
     }
 
+    @Override
     public void inputReady(final IOSession session) {
         final NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
@@ -222,6 +225,7 @@ public class SSLServerIOEventDispatch im
         }
     }
 
+    @Override
     public void outputReady(final IOSession session) {
         final NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
@@ -239,6 +243,7 @@ public class SSLServerIOEventDispatch im
         }
     }
 
+    @Override
     public void timeout(final IOSession session) {
         final NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
Thu Jun 23 20:09:52 2016
@@ -50,10 +50,12 @@ class SSLIOSessionHandlerAdaptor impleme
         this.handler = handler;
     }
 
+    @Override
     public void initalize(final SSLEngine sslengine) throws SSLException {
         this.handler.initalize(sslengine, this.params != null ? this.params : new BasicHttpParams());
     }
 
+    @Override
     public void verify(final IOSession iosession, final SSLSession sslsession) throws SSLException
{
         this.handler.verify(iosession.getRemoteAddress(), sslsession);
     }

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
Thu Jun 23 20:09:52 2016
@@ -50,10 +50,12 @@ class SSLSetupHandlerAdaptor implements
         this.handler = handler;
     }
 
+    @Override
     public void initalize(final SSLEngine sslengine) throws SSLException {
         this.handler.initalize(sslengine, this.params != null ? this.params : new BasicHttpParams());
     }
 
+    @Override
     public void verify(final IOSession iosession, final SSLSession sslsession) throws SSLException
{
         this.handler.verify(iosession, sslsession);
     }

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java
Thu Jun 23 20:09:52 2016
@@ -69,6 +69,7 @@ public class BufferingNHttpEntity extend
         this.buffer = new SimpleInputBuffer(BUFFER_SIZE, allocator);
     }
 
+    @Override
     public void consumeContent(
             final ContentDecoder decoder,
             final IOControl ioctrl) throws IOException {
@@ -78,6 +79,7 @@ public class BufferingNHttpEntity extend
         }
     }
 
+    @Override
     public void finish() {
         this.finished = true;
     }

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
Thu Jun 23 20:09:52 2016
@@ -78,12 +78,14 @@ public class ConsumingNHttpEntityTemplat
         throw new UnsupportedOperationException("Does not support blocking methods");
     }
 
+    @Override
     public void consumeContent(
             final ContentDecoder decoder,
             final IOControl ioctrl) throws IOException {
         this.contentListener.contentAvailable(decoder, ioctrl);
     }
 
+    @Override
     public void finish() {
         this.contentListener.finished();
     }

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java
Thu Jun 23 20:09:52 2016
@@ -81,6 +81,7 @@ public class NHttpEntityWrapper
         throw new UnsupportedOperationException("Does not support blocking methods");
     }
 
+    @Override
     public void produceContent(
             final ContentEncoder encoder,
             final IOControl ioctrl) throws IOException {
@@ -95,6 +96,7 @@ public class NHttpEntityWrapper
         }
     }
 
+    @Override
     public void finish() {
         try {
             this.channel.close();

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java
Thu Jun 23 20:09:52 2016
@@ -53,6 +53,7 @@ public class SkipContentListener impleme
         this.buffer = allocator.allocate(2048);
     }
 
+    @Override
     public void contentAvailable(
             final ContentDecoder decoder,
             final IOControl ioctrl) throws IOException {
@@ -63,6 +64,7 @@ public class SkipContentListener impleme
         } while (lastRead > 0);
     }
 
+    @Override
     public void finished() {
     }
 

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
Thu Jun 23 20:09:52 2016
@@ -116,6 +116,7 @@ public class AsyncNHttpClientHandler ext
         this(httpProcessor, execHandler, connStrategy, HeapByteBufferAllocator.INSTANCE,
params);
     }
 
+    @Override
     public void connected(final NHttpClientConnection conn, final Object attachment) {
         final HttpContext context = conn.getContext();
 
@@ -131,6 +132,7 @@ public class AsyncNHttpClientHandler ext
         requestReady(conn);
     }
 
+    @Override
     public void closed(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -150,6 +152,7 @@ public class AsyncNHttpClientHandler ext
         }
     }
 
+    @Override
     public void exception(final NHttpClientConnection conn, final HttpException ex) {
         closeConnection(conn, ex);
         if (this.eventListener != null) {
@@ -157,6 +160,7 @@ public class AsyncNHttpClientHandler ext
         }
     }
 
+    @Override
     public void exception(final NHttpClientConnection conn, final IOException ex) {
         shutdownConnection(conn, ex);
         if (this.eventListener != null) {
@@ -164,6 +168,7 @@ public class AsyncNHttpClientHandler ext
         }
     }
 
+    @Override
     public void requestReady(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -227,6 +232,7 @@ public class AsyncNHttpClientHandler ext
         }
     }
 
+    @Override
     public void inputReady(final NHttpClientConnection conn, final ContentDecoder decoder)
{
         final HttpContext context = conn.getContext();
 
@@ -253,6 +259,7 @@ public class AsyncNHttpClientHandler ext
         }
     }
 
+    @Override
     public void outputReady(final NHttpClientConnection conn, final ContentEncoder encoder)
{
         final HttpContext context = conn.getContext();
         final ClientConnState connState = (ClientConnState) context.getAttribute(CONN_STATE);
@@ -277,6 +284,7 @@ public class AsyncNHttpClientHandler ext
         }
     }
 
+    @Override
     public void responseReceived(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
         final ClientConnState connState = (ClientConnState) context.getAttribute(CONN_STATE);
@@ -343,6 +351,7 @@ public class AsyncNHttpClientHandler ext
         }
     }
 
+    @Override
     public void timeout(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
         final ClientConnState connState = (ClientConnState) context.getAttribute(CONN_STATE);

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
Thu Jun 23 20:09:52 2016
@@ -137,6 +137,7 @@ public class AsyncNHttpServiceHandler ex
         this.handlerResolver = handlerResolver;
     }
 
+    @Override
     public void connected(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -149,6 +150,7 @@ public class AsyncNHttpServiceHandler ex
         }
     }
 
+    @Override
     public void requestReceived(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -237,6 +239,7 @@ public class AsyncNHttpServiceHandler ex
 
     }
 
+    @Override
     public void closed(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -253,6 +256,7 @@ public class AsyncNHttpServiceHandler ex
         }
     }
 
+    @Override
     public void exception(final NHttpServerConnection conn, final HttpException httpex) {
         if (conn.isResponseSubmitted()) {
             // There is not much that we can do if a response head
@@ -287,6 +291,7 @@ public class AsyncNHttpServiceHandler ex
         }
     }
 
+    @Override
     public void exception(final NHttpServerConnection conn, final IOException ex) {
         shutdownConnection(conn, ex);
 
@@ -295,10 +300,12 @@ public class AsyncNHttpServiceHandler ex
         }
     }
 
+    @Override
     public void timeout(final NHttpServerConnection conn) {
         handleTimeout(conn);
     }
 
+    @Override
     public void inputReady(final NHttpServerConnection conn, final ContentDecoder decoder)
{
         final HttpContext context = conn.getContext();
         final ServerConnState connState = (ServerConnState) context.getAttribute(CONN_STATE);
@@ -327,6 +334,7 @@ public class AsyncNHttpServiceHandler ex
         }
     }
 
+    @Override
     public void responseReady(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
         final ServerConnState connState = (ServerConnState) context.getAttribute(CONN_STATE);
@@ -373,6 +381,7 @@ public class AsyncNHttpServiceHandler ex
         }
     }
 
+    @Override
     public void outputReady(final NHttpServerConnection conn, final ContentEncoder encoder)
{
         final HttpContext context = conn.getContext();
         final ServerConnState connState = (ServerConnState) context.getAttribute(CONN_STATE);
@@ -658,6 +667,7 @@ public class AsyncNHttpServiceHandler ex
             this.iocontrol = iocontrol;
         }
 
+        @Override
         public void submitResponse(final HttpResponse response) {
             Args.notNull(response, "Response");
             Asserts.check(!this.triggered, "Response already triggered");
@@ -666,6 +676,7 @@ public class AsyncNHttpServiceHandler ex
             this.iocontrol.requestOutput();
         }
 
+        @Override
         public void handleException(final HttpException ex) {
             Asserts.check(!this.triggered, "Response already triggered");
             this.triggered = true;
@@ -673,6 +684,7 @@ public class AsyncNHttpServiceHandler ex
             this.iocontrol.requestOutput();
         }
 
+        @Override
         public void handleException(final IOException ex) {
             Asserts.check(!this.triggered, "Response already triggered");
             this.triggered = true;

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
Thu Jun 23 20:09:52 2016
@@ -114,6 +114,7 @@ public class BasicAsyncRequestExecutionH
         }
     }
 
+    @Override
     public void close() throws IOException {
         releaseResources();
         if (!this.future.isDone()) {
@@ -121,40 +122,49 @@ public class BasicAsyncRequestExecutionH
         }
     }
 
+    @Override
     public HttpHost getTarget() {
         return this.requestProducer.getTarget();
     }
 
+    @Override
     public HttpRequest generateRequest() throws IOException, HttpException {
         return this.requestProducer.generateRequest();
     }
 
+    @Override
     public void produceContent(
             final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
         this.requestProducer.produceContent(encoder, ioctrl);
     }
 
+    @Override
     public void requestCompleted(final HttpContext context) {
         this.requestProducer.requestCompleted(context);
         this.requestSent = true;
     }
 
+    @Override
     public boolean isRepeatable() {
         return false;
     }
 
+    @Override
     public void resetRequest() {
     }
 
+    @Override
     public void responseReceived(final HttpResponse response) throws IOException, HttpException
{
         this.responseConsumer.responseReceived(response);
     }
 
+    @Override
     public void consumeContent(
             final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
         this.responseConsumer.consumeContent(decoder, ioctrl);
     }
 
+    @Override
     public void failed(final Exception ex) {
         try {
             if (!this.requestSent) {
@@ -170,6 +180,7 @@ public class BasicAsyncRequestExecutionH
         }
     }
 
+    @Override
     public boolean cancel() {
         try {
             final boolean cancelled = this.responseConsumer.cancel();
@@ -182,6 +193,7 @@ public class BasicAsyncRequestExecutionH
         }
     }
 
+    @Override
     public void responseCompleted(final HttpContext context) {
         try {
             this.responseConsumer.responseCompleted(context);
@@ -199,26 +211,32 @@ public class BasicAsyncRequestExecutionH
         }
     }
 
+    @Override
     public T getResult() {
         return this.responseConsumer.getResult();
     }
 
+    @Override
     public Exception getException() {
         return this.responseConsumer.getException();
     }
 
+    @Override
     public HttpContext getContext() {
         return this.localContext;
     }
 
+    @Override
     public HttpProcessor getHttpProcessor() {
         return this.httppocessor;
     }
 
+    @Override
     public ConnectionReuseStrategy getConnectionReuseStrategy() {
         return this.reuseStrategy;
     }
 
+    @Override
     public boolean isDone() {
         return this.responseConsumer.isDone();
     }

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpClientHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
Thu Jun 23 20:09:52 2016
@@ -100,38 +100,47 @@ public class BufferingHttpClientHandler
         this.asyncHandler.setEventListener(eventListener);
     }
 
+    @Override
     public void connected(final NHttpClientConnection conn, final Object attachment) {
         this.asyncHandler.connected(conn, attachment);
     }
 
+    @Override
     public void closed(final NHttpClientConnection conn) {
         this.asyncHandler.closed(conn);
     }
 
+    @Override
     public void requestReady(final NHttpClientConnection conn) {
         this.asyncHandler.requestReady(conn);
     }
 
+    @Override
     public void inputReady(final NHttpClientConnection conn, final ContentDecoder decoder)
{
         this.asyncHandler.inputReady(conn, decoder);
     }
 
+    @Override
     public void outputReady(final NHttpClientConnection conn, final ContentEncoder encoder)
{
         this.asyncHandler.outputReady(conn, encoder);
     }
 
+    @Override
     public void responseReceived(final NHttpClientConnection conn) {
         this.asyncHandler.responseReceived(conn);
     }
 
+    @Override
     public void exception(final NHttpClientConnection conn, final HttpException httpex) {
         this.asyncHandler.exception(conn, httpex);
     }
 
+    @Override
     public void exception(final NHttpClientConnection conn, final IOException ioex) {
         this.asyncHandler.exception(conn, ioex);
     }
 
+    @Override
     public void timeout(final NHttpClientConnection conn) {
         this.asyncHandler.timeout(conn);
     }
@@ -145,17 +154,21 @@ public class BufferingHttpClientHandler
             this.execHandler = execHandler;
         }
 
+        @Override
         public void initalizeContext(final HttpContext context, final Object attachment)
{
             this.execHandler.initalizeContext(context, attachment);
         }
+        @Override
         public void finalizeContext(final HttpContext context) {
             this.execHandler.finalizeContext(context);
         }
 
+        @Override
         public HttpRequest submitRequest(final HttpContext context) {
             return this.execHandler.submitRequest(context);
         }
 
+        @Override
         public ConsumingNHttpEntity responseEntity(
                 final HttpResponse response,
                 final HttpContext context) throws IOException {
@@ -164,6 +177,7 @@ public class BufferingHttpClientHandler
                     HeapByteBufferAllocator.INSTANCE);
         }
 
+        @Override
         public void handleResponse(
                 final HttpResponse response,
                 final HttpContext context) throws IOException {

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
Thu Jun 23 20:09:52 2016
@@ -117,44 +117,54 @@ public class BufferingHttpServiceHandler
         this.handlerResolver = handlerResolver;
     }
 
+    @Override
     public void connected(final NHttpServerConnection conn) {
         this.asyncHandler.connected(conn);
     }
 
+    @Override
     public void closed(final NHttpServerConnection conn) {
         this.asyncHandler.closed(conn);
     }
 
+    @Override
     public void requestReceived(final NHttpServerConnection conn) {
         this.asyncHandler.requestReceived(conn);
     }
 
+    @Override
     public void inputReady(final NHttpServerConnection conn, final ContentDecoder decoder)
{
         this.asyncHandler.inputReady(conn, decoder);
     }
 
+    @Override
     public void responseReady(final NHttpServerConnection conn) {
         this.asyncHandler.responseReady(conn);
     }
 
+    @Override
     public void outputReady(final NHttpServerConnection conn, final ContentEncoder encoder)
{
         this.asyncHandler.outputReady(conn, encoder);
     }
 
+    @Override
     public void exception(final NHttpServerConnection conn, final HttpException httpex) {
         this.asyncHandler.exception(conn, httpex);
     }
 
+    @Override
     public void exception(final NHttpServerConnection conn, final IOException ioex) {
         this.asyncHandler.exception(conn, ioex);
     }
 
+    @Override
     public void timeout(final NHttpServerConnection conn) {
         this.asyncHandler.timeout(conn);
     }
 
     class RequestHandlerResolverAdaptor implements NHttpRequestHandlerResolver {
 
+        @Override
         public NHttpRequestHandler lookup(final String requestURI) {
             final HttpRequestHandler handler = handlerResolver.lookup(requestURI);
             if (handler != null) {
@@ -175,6 +185,7 @@ public class BufferingHttpServiceHandler
             this.requestHandler = requestHandler;
         }
 
+        @Override
         public ConsumingNHttpEntity entityRequest(
                 final HttpEntityEnclosingRequest request,
                 final HttpContext context) throws HttpException, IOException {

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java
Thu Jun 23 20:09:52 2016
@@ -96,6 +96,7 @@ public class HttpAsyncRequestHandlerRegi
         return matcher.getObjects();
     }
 
+    @Override
     public HttpAsyncRequestHandler<?> lookup(final String requestURI) {
         return matcher.lookup(requestURI);
     }

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
Thu Jun 23 20:09:52 2016
@@ -97,6 +97,7 @@ public class NHttpRequestHandlerRegistry
         return matcher.getObjects();
     }
 
+    @Override
     public NHttpRequestHandler lookup(final String requestURI) {
         return matcher.lookup(requestURI);
     }

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java
Thu Jun 23 20:09:52 2016
@@ -66,6 +66,7 @@ class NullNHttpEntity extends HttpEntity
         throw new UnsupportedOperationException("Does not support blocking methods");
     }
 
+    @Override
     public void consumeContent(
             final ContentDecoder decoder,
             final IOControl ioctrl) throws IOException {
@@ -76,6 +77,7 @@ class NullNHttpEntity extends HttpEntity
         } while (lastRead > 0);
     }
 
+    @Override
     public void finish() {
     }
 

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
Thu Jun 23 20:09:52 2016
@@ -46,6 +46,7 @@ import java.io.IOException;
 @Deprecated
 public abstract class SimpleNHttpRequestHandler implements NHttpRequestHandler {
 
+    @Override
     public final void handle(
             final HttpRequest request,
             final HttpResponse response,

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
Thu Jun 23 20:09:52 2016
@@ -133,6 +133,7 @@ public class ThrottlingHttpClientHandler
                 DirectByteBufferAllocator.INSTANCE, executor, params);
     }
 
+    @Override
     public void connected(final NHttpClientConnection conn, final Object attachment) {
         final HttpContext context = conn.getContext();
 
@@ -148,6 +149,7 @@ public class ThrottlingHttpClientHandler
         requestReady(conn);
     }
 
+    @Override
     public void closed(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
         final ClientConnState connState = (ClientConnState) context.getAttribute(CONN_STATE);
@@ -165,6 +167,7 @@ public class ThrottlingHttpClientHandler
         }
     }
 
+    @Override
     public void exception(final NHttpClientConnection conn, final HttpException ex) {
         closeConnection(conn, ex);
         if (this.eventListener != null) {
@@ -172,6 +175,7 @@ public class ThrottlingHttpClientHandler
         }
     }
 
+    @Override
     public void exception(final NHttpClientConnection conn, final IOException ex) {
         shutdownConnection(conn, ex);
         if (this.eventListener != null) {
@@ -180,6 +184,7 @@ public class ThrottlingHttpClientHandler
     }
 
 
+    @Override
     public void requestReady(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -240,6 +245,7 @@ public class ThrottlingHttpClientHandler
         }
     }
 
+    @Override
     public void outputReady(final NHttpClientConnection conn, final ContentEncoder encoder)
{
         final HttpContext context = conn.getContext();
 
@@ -271,6 +277,7 @@ public class ThrottlingHttpClientHandler
         }
     }
 
+    @Override
     public void responseReceived(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
         final ClientConnState connState = (ClientConnState) context.getAttribute(CONN_STATE);
@@ -342,6 +349,7 @@ public class ThrottlingHttpClientHandler
         }
     }
 
+    @Override
     public void inputReady(final NHttpClientConnection conn, final ContentDecoder decoder)
{
         final HttpContext context = conn.getContext();
 
@@ -374,6 +382,7 @@ public class ThrottlingHttpClientHandler
         }
     }
 
+    @Override
     public void timeout(final NHttpClientConnection conn) {
         final HttpContext context = conn.getContext();
         final ClientConnState connState = (ClientConnState) context.getAttribute(CONN_STATE);
@@ -436,6 +445,7 @@ public class ThrottlingHttpClientHandler
 
             this.executor.execute(new Runnable() {
 
+                @Override
                 public void run() {
                     try {
 
@@ -492,6 +502,7 @@ public class ThrottlingHttpClientHandler
 
         this.executor.execute(new Runnable() {
 
+            @Override
             public void run() {
                 try {
 

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
Thu Jun 23 20:09:52 2016
@@ -155,6 +155,7 @@ public class ThrottlingHttpServiceHandle
         this.expectationVerifier = expectationVerifier;
     }
 
+    @Override
     public void connected(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -166,6 +167,7 @@ public class ThrottlingHttpServiceHandle
         }
     }
 
+    @Override
     public void closed(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
         final ServerConnState connState = (ServerConnState) context.getAttribute(CONN_STATE);
@@ -182,6 +184,7 @@ public class ThrottlingHttpServiceHandle
         }
     }
 
+    @Override
     public void exception(final NHttpServerConnection conn, final HttpException httpex) {
         if (conn.isResponseSubmitted()) {
             if (eventListener != null) {
@@ -226,6 +229,7 @@ public class ThrottlingHttpServiceHandle
         }
     }
 
+    @Override
     public void exception(final NHttpServerConnection conn, final IOException ex) {
         shutdownConnection(conn, ex);
 
@@ -234,10 +238,12 @@ public class ThrottlingHttpServiceHandle
         }
     }
 
+    @Override
     public void timeout(final NHttpServerConnection conn) {
         handleTimeout(conn);
     }
 
+    @Override
     public void requestReceived(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -259,6 +265,7 @@ public class ThrottlingHttpServiceHandle
 
             this.executor.execute(new Runnable() {
 
+                @Override
                 public void run() {
                     try {
 
@@ -284,6 +291,7 @@ public class ThrottlingHttpServiceHandle
 
     }
 
+    @Override
     public void inputReady(final NHttpServerConnection conn, final ContentDecoder decoder)
{
         final HttpContext context = conn.getContext();
 
@@ -313,6 +321,7 @@ public class ThrottlingHttpServiceHandle
 
     }
 
+    @Override
     public void responseReady(final NHttpServerConnection conn) {
         final HttpContext context = conn.getContext();
 
@@ -365,6 +374,7 @@ public class ThrottlingHttpServiceHandle
         }
     }
 
+    @Override
     public void outputReady(final NHttpServerConnection conn, final ContentEncoder encoder)
{
         final HttpContext context = conn.getContext();
 

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
Thu Jun 23 20:09:52 2016
@@ -124,6 +124,7 @@ public class NByteArrayEntity extends Ab
      *
      * @deprecated (4.2) use {@link #close()}
      */
+    @Override
     @Deprecated
     public void finish() {
         close();

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
Thu Jun 23 20:09:52 2016
@@ -141,6 +141,7 @@ public class NFileEntity extends Abstrac
      *
      * @deprecated (4.2) use {@link #close()}
      */
+    @Override
     @Deprecated
     public void finish() throws IOException {
         close();

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java?rev=1750003&r1=1750002&r2=1750003&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
(original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
Thu Jun 23 20:09:52 2016
@@ -163,6 +163,7 @@ public class NStringEntity extends Abstr
      *
      * @deprecated (4.2) use {@link #close()}
      */
+    @Override
     @Deprecated
     public void finish() {
         close();




Mime
View raw message