hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1726962 [1/2] - in /httpcomponents/httpclient/branches/4.5.x: httpclient-win/src/test/java/org/apache/http/impl/auth/win/ httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ httpclient/src/main/java-deprecated/org/apache/h...
Date Wed, 27 Jan 2016 08:51:01 GMT
Author: ggregory
Date: Wed Jan 27 08:51:00 2016
New Revision: 1726962

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

Modified:
    httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/HttpConnPool.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/KerberosCredentials.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
    httpcomponents/httpclient/branches/4.5.x/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/MultipartEntity.java

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java Wed Jan 27 08:51:00 2016
@@ -100,6 +100,7 @@ public class TestWindowsNegotiateScheme
 
         final Registry<AuthSchemeProvider> authSchemeRegistry = RegistryBuilder.<AuthSchemeProvider>create()
             .register(AuthSchemes.SPNEGO, new AuthSchemeProvider() {
+                @Override
                 public AuthScheme create(final HttpContext context) {
                     return new WindowsNegotiateSchemeGetTokenFail(AuthSchemes.SPNEGO, "HTTP/example.com");
                 }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java Wed Jan 27 08:51:00 2016
@@ -56,6 +56,7 @@ public class RequestProxyAuthentication
         super();
     }
 
+    @Override
     public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java Wed Jan 27 08:51:00 2016
@@ -53,6 +53,7 @@ public class RequestTargetAuthentication
         super();
     }
 
+    @Override
     public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java Wed Jan 27 08:51:00 2016
@@ -67,6 +67,7 @@ public class ResponseAuthCache implement
         super();
     }
 
+    @Override
     public void process(final HttpResponse response, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(response, "HTTP request");

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java Wed Jan 27 08:51:00 2016
@@ -63,6 +63,7 @@ public class BasicEofSensorWatcher imple
         attemptReuse = reuse;
     }
 
+    @Override
     public boolean eofDetected(final InputStream wrapped)
         throws IOException {
 
@@ -79,6 +80,7 @@ public class BasicEofSensorWatcher imple
         return false;
     }
 
+    @Override
     public boolean streamClosed(final InputStream wrapped)
         throws IOException {
 
@@ -95,6 +97,7 @@ public class BasicEofSensorWatcher imple
         return false;
     }
 
+    @Override
     public boolean streamAbort(final InputStream wrapped)
         throws IOException {
 

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java Wed Jan 27 08:51:00 2016
@@ -120,10 +120,12 @@ public class BasicManagedEntity extends
         ensureConsumed();
     }
 
+    @Override
     public void releaseConnection() throws IOException {
         ensureConsumed();
     }
 
+    @Override
     public void abortConnection() throws IOException {
 
         if (managedConn != null) {
@@ -135,6 +137,7 @@ public class BasicManagedEntity extends
         }
     }
 
+    @Override
     public boolean eofDetected(final InputStream wrapped) throws IOException {
         try {
             if (managedConn != null) {
@@ -153,6 +156,7 @@ public class BasicManagedEntity extends
         return false;
     }
 
+    @Override
     public boolean streamClosed(final InputStream wrapped) throws IOException {
         try {
             if (managedConn != null) {
@@ -178,6 +182,7 @@ public class BasicManagedEntity extends
         return false;
     }
 
+    @Override
     public boolean streamAbort(final InputStream wrapped) throws IOException {
         if (managedConn != null) {
             managedConn.abortConnection();

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java Wed Jan 27 08:51:00 2016
@@ -83,6 +83,7 @@ public final class MultihomePlainSocketF
 
 
     // non-javadoc, see interface org.apache.http.conn.SocketFactory
+    @Override
     public Socket createSocket() {
         return new Socket();
     }
@@ -102,6 +103,7 @@ public final class MultihomePlainSocketF
      * @throws  IOException if an error occurs during the connection
      * @throws  SocketTimeoutException if timeout expires before connecting
      */
+    @Override
     public Socket connectSocket(final Socket socket, final String host, final int port,
                                 final InetAddress localAddress, final int localPort,
                                 final HttpParams params)
@@ -159,6 +161,7 @@ public final class MultihomePlainSocketF
      *
      * @throws IllegalArgumentException if the argument is invalid
      */
+    @Override
     public final boolean isSecure(final Socket sock)
         throws IllegalArgumentException {
 

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java Wed Jan 27 08:51:00 2016
@@ -83,6 +83,7 @@ public final class ConnManagerParams imp
     /** The default maximum number of connections allowed per host */
     private static final ConnPerRoute DEFAULT_CONN_PER_ROUTE = new ConnPerRoute() {
 
+        @Override
         public int getMaxForRoute(final HttpRoute route) {
             return ConnPerRouteBean.DEFAULT_MAX_CONNECTIONS_PER_ROUTE;
         }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java Wed Jan 27 08:51:00 2016
@@ -86,6 +86,7 @@ public final class ConnPerRouteBean impl
         this.maxPerHostMap.put(route, Integer.valueOf(max));
     }
 
+    @Override
     public int getMaxForRoute(final HttpRoute route) {
         Args.notNull(route, "HTTP route");
         final Integer max = this.maxPerHostMap.get(route);

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java Wed Jan 27 08:51:00 2016
@@ -83,10 +83,12 @@ public class PlainSocketFactory implemen
      *
      * @since 4.1
      */
+    @Override
     public Socket createSocket(final HttpParams params) {
         return new Socket();
     }
 
+    @Override
     public Socket createSocket() {
         return new Socket();
     }
@@ -94,6 +96,7 @@ public class PlainSocketFactory implemen
     /**
      * @since 4.1
      */
+    @Override
     public Socket connectSocket(
             final Socket socket,
             final InetSocketAddress remoteAddress,
@@ -130,6 +133,7 @@ public class PlainSocketFactory implemen
      *
      * @return  {@code false}
      */
+    @Override
     public final boolean isSecure(final Socket sock) {
         return false;
     }
@@ -137,6 +141,7 @@ public class PlainSocketFactory implemen
     /**
      * @deprecated (4.1)  Use {@link #connectSocket(Socket, InetSocketAddress, InetSocketAddress, HttpParams)}
      */
+    @Override
     @Deprecated
     public Socket connectSocket(
             final Socket socket,

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java Wed Jan 27 08:51:00 2016
@@ -379,10 +379,12 @@ public class SSLSocketFactory implements
      *               This method will create a unconnected instance of {@link Socket} class.
      * @since 4.1
      */
+    @Override
     public Socket createSocket(final HttpParams params) throws IOException {
         return createSocket((HttpContext) null);
     }
 
+    @Override
     public Socket createSocket() throws IOException {
         return createSocket((HttpContext) null);
     }
@@ -390,6 +392,7 @@ public class SSLSocketFactory implements
     /**
      * @since 4.1
      */
+    @Override
     public Socket connectSocket(
             final Socket socket,
             final InetSocketAddress remoteAddress,
@@ -424,6 +427,7 @@ public class SSLSocketFactory implements
      *
      * @throws IllegalArgumentException if the argument is invalid
      */
+    @Override
     public boolean isSecure(final Socket sock) throws IllegalArgumentException {
         Args.notNull(sock, "Socket");
         Asserts.check(sock instanceof SSLSocket, "Socket not created by this factory");
@@ -434,6 +438,7 @@ public class SSLSocketFactory implements
     /**
      * @since 4.2
      */
+    @Override
     public Socket createLayeredSocket(
         final Socket socket,
         final String host,
@@ -442,6 +447,7 @@ public class SSLSocketFactory implements
         return createLayeredSocket(socket, host, port, (HttpContext) null);
     }
 
+    @Override
     public Socket createLayeredSocket(
         final Socket socket,
         final String host,
@@ -459,6 +465,7 @@ public class SSLSocketFactory implements
         return this.hostnameVerifier;
     }
 
+    @Override
     public Socket connectSocket(
             final Socket socket,
             final String host, final int port,
@@ -479,6 +486,7 @@ public class SSLSocketFactory implements
         return connectSocket(socket, remoteAddress, localAddress, params);
     }
 
+    @Override
     public Socket createSocket(
             final Socket socket,
             final String host, final int port,
@@ -509,12 +517,14 @@ public class SSLSocketFactory implements
         prepareSocket(socket);
     }
 
+    @Override
     public Socket createSocket(final HttpContext context) throws IOException {
         final SSLSocket sock = (SSLSocket) this.socketfactory.createSocket();
         internalPrepareSocket(sock);
         return sock;
     }
 
+    @Override
     public Socket connectSocket(
             final int connectTimeout,
             final Socket socket,
@@ -548,6 +558,7 @@ public class SSLSocketFactory implements
         }
     }
 
+    @Override
     public Socket createLayeredSocket(
             final Socket socket,
             final String target,

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java Wed Jan 27 08:51:00 2016
@@ -79,6 +79,7 @@ public class NegotiateScheme extends GGS
      *
      * @return {@code Negotiate}
      */
+    @Override
     public String getSchemeName() {
         return "Negotiate";
     }
@@ -181,6 +182,7 @@ public class NegotiateScheme extends GGS
      *
      * @return the parameter with the given name
      */
+    @Override
     public String getParameter(final String name) {
         Args.notNull(name, "Parameter name");
         return null;
@@ -192,6 +194,7 @@ public class NegotiateScheme extends GGS
      *
      * @return {@code null}
      */
+    @Override
     public String getRealm() {
         return null;
     }
@@ -202,6 +205,7 @@ public class NegotiateScheme extends GGS
      *
      * @return {@code true}.
      */
+    @Override
     public boolean isConnectionBased() {
         return true;
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateSchemeFactory.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateSchemeFactory.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateSchemeFactory.java Wed Jan 27 08:51:00 2016
@@ -58,6 +58,7 @@ public class NegotiateSchemeFactory impl
         this(null, false);
     }
 
+    @Override
     public AuthScheme newInstance(final HttpParams params) {
         return new NegotiateScheme(this.spengoGenerator, this.stripPort);
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java Wed Jan 27 08:51:00 2016
@@ -135,6 +135,7 @@ public abstract class AbstractAuthentica
         return getAuthPreferences();
     }
 
+    @Override
     public AuthScheme selectScheme(
             final Map<String, Header> challenges,
             final HttpResponse response,

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java Wed Jan 27 08:51:00 2016
@@ -461,6 +461,7 @@ public abstract class AbstractHttpClient
     }
 
     // non-javadoc, see interface HttpClient
+    @Override
     public synchronized final HttpParams getParams() {
         if (defaultParams == null) {
             defaultParams = createHttpParams();
@@ -479,6 +480,7 @@ public abstract class AbstractHttpClient
     }
 
 
+    @Override
     public synchronized final ClientConnectionManager getConnectionManager() {
         if (connManager == null) {
             connManager = createClientConnectionManager();
@@ -1007,6 +1009,7 @@ public abstract class AbstractHttpClient
     }
 
 
+    @Override
     public void close() {
         getConnectionManager().shutdown();
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java Wed Jan 27 08:51:00 2016
@@ -69,6 +69,7 @@ class AuthenticationStrategyAdaptor impl
         this.handler = handler;
     }
 
+    @Override
     public boolean isAuthenticationRequested(
             final HttpHost authhost,
             final HttpResponse response,
@@ -76,6 +77,7 @@ class AuthenticationStrategyAdaptor impl
         return this.handler.isAuthenticationRequested(response, context);
     }
 
+    @Override
     public Map<String, Header> getChallenges(
             final HttpHost authhost,
             final HttpResponse response,
@@ -83,6 +85,7 @@ class AuthenticationStrategyAdaptor impl
         return this.handler.getChallenges(response, context);
     }
 
+    @Override
     public Queue<AuthOption> select(
             final Map<String, Header> challenges,
             final HttpHost authhost,
@@ -127,6 +130,7 @@ class AuthenticationStrategyAdaptor impl
         return options;
     }
 
+    @Override
     public void authSucceeded(
             final HttpHost authhost, final AuthScheme authScheme, final HttpContext context) {
         AuthCache authCache = (AuthCache) context.getAttribute(ClientContext.AUTH_CACHE);
@@ -143,6 +147,7 @@ class AuthenticationStrategyAdaptor impl
         }
     }
 
+    @Override
     public void authFailed(
             final HttpHost authhost, final AuthScheme authScheme, final HttpContext context) {
         final AuthCache authCache = (AuthCache) context.getAttribute(ClientContext.AUTH_CACHE);

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java Wed Jan 27 08:51:00 2016
@@ -107,17 +107,20 @@ public class AutoRetryHttpClient impleme
         this(client, new DefaultServiceUnavailableRetryStrategy());
     }
 
+    @Override
     public HttpResponse execute(final HttpHost target, final HttpRequest request)
             throws IOException {
         final HttpContext defaultContext = null;
         return execute(target, request, defaultContext);
     }
 
+    @Override
     public <T> T execute(final HttpHost target, final HttpRequest request,
             final ResponseHandler<? extends T> responseHandler) throws IOException {
         return execute(target, request, responseHandler, null);
     }
 
+    @Override
     public <T> T execute(final HttpHost target, final HttpRequest request,
             final ResponseHandler<? extends T> responseHandler, final HttpContext context)
             throws IOException {
@@ -125,11 +128,13 @@ public class AutoRetryHttpClient impleme
         return responseHandler.handleResponse(resp);
     }
 
+    @Override
     public HttpResponse execute(final HttpUriRequest request) throws IOException {
         final HttpContext context = null;
         return execute(request, context);
     }
 
+    @Override
     public HttpResponse execute(final HttpUriRequest request, final HttpContext context)
             throws IOException {
         final URI uri = request.getURI();
@@ -138,11 +143,13 @@ public class AutoRetryHttpClient impleme
         return execute(httpHost, request, context);
     }
 
+    @Override
     public <T> T execute(final HttpUriRequest request,
             final ResponseHandler<? extends T> responseHandler) throws IOException {
         return execute(request, responseHandler, null);
     }
 
+    @Override
     public <T> T execute(final HttpUriRequest request,
             final ResponseHandler<? extends T> responseHandler, final HttpContext context)
             throws IOException {
@@ -150,6 +157,7 @@ public class AutoRetryHttpClient impleme
         return responseHandler.handleResponse(resp);
     }
 
+    @Override
     public HttpResponse execute(final HttpHost target, final HttpRequest request,
             final HttpContext context) throws IOException {
         for (int c = 1;; c++) {
@@ -179,10 +187,12 @@ public class AutoRetryHttpClient impleme
         }
     }
 
+    @Override
     public ClientConnectionManager getConnectionManager() {
         return backend.getConnectionManager();
     }
 
+    @Override
     public HttpParams getParams() {
         return backend.getParams();
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java Wed Jan 27 08:51:00 2016
@@ -189,6 +189,7 @@ public class ClientParamsStack extends A
      * @return  the highest-priority value for that parameter, or
      *          {@code null} if it is not set anywhere in this stack
      */
+    @Override
     public Object getParameter(final String name) {
         Args.notNull(name, "Parameter name");
 
@@ -222,6 +223,7 @@ public class ClientParamsStack extends A
      *
      * @throws UnsupportedOperationException    always
      */
+    @Override
     public HttpParams setParameter(final String name, final Object value)
         throws UnsupportedOperationException {
 
@@ -242,6 +244,7 @@ public class ClientParamsStack extends A
      *
      * @throws UnsupportedOperationException    always
      */
+    @Override
     public boolean removeParameter(final String name) {
         throw new UnsupportedOperationException
         ("Removing parameters in a stack is not supported.");
@@ -262,6 +265,7 @@ public class ClientParamsStack extends A
      *
      * @return {@code this} parameter stack
      */
+    @Override
     public HttpParams copy() {
         return this;
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java Wed Jan 27 08:51:00 2016
@@ -107,14 +107,17 @@ public class DecompressingHttpClient imp
         this.contentEncodingInterceptor = responseInterceptor;
     }
 
+    @Override
     public HttpParams getParams() {
         return backend.getParams();
     }
 
+    @Override
     public ClientConnectionManager getConnectionManager() {
         return backend.getConnectionManager();
     }
 
+    @Override
     public HttpResponse execute(final HttpUriRequest request) throws IOException,
             ClientProtocolException {
         return execute(getHttpHost(request), request, (HttpContext)null);
@@ -134,16 +137,19 @@ public class DecompressingHttpClient imp
         return URIUtils.extractHost(uri);
     }
 
+    @Override
     public HttpResponse execute(final HttpUriRequest request, final HttpContext context)
             throws IOException, ClientProtocolException {
         return execute(getHttpHost(request), request, context);
     }
 
+    @Override
     public HttpResponse execute(final HttpHost target, final HttpRequest request)
             throws IOException, ClientProtocolException {
         return execute(target, request, (HttpContext)null);
     }
 
+    @Override
     public HttpResponse execute(final HttpHost target, final HttpRequest request,
             final HttpContext context) throws IOException, ClientProtocolException {
         try {
@@ -179,24 +185,28 @@ public class DecompressingHttpClient imp
         }
     }
 
+    @Override
     public <T> T execute(final HttpUriRequest request,
             final ResponseHandler<? extends T> responseHandler) throws IOException,
             ClientProtocolException {
         return execute(getHttpHost(request), request, responseHandler);
     }
 
+    @Override
     public <T> T execute(final HttpUriRequest request,
             final ResponseHandler<? extends T> responseHandler, final HttpContext context)
             throws IOException, ClientProtocolException {
         return execute(getHttpHost(request), request, responseHandler, context);
     }
 
+    @Override
     public <T> T execute(final HttpHost target, final HttpRequest request,
             final ResponseHandler<? extends T> responseHandler) throws IOException,
             ClientProtocolException {
         return execute(target, request, responseHandler, null);
     }
 
+    @Override
     public <T> T execute(final HttpHost target, final HttpRequest request,
             final ResponseHandler<? extends T> responseHandler, final HttpContext context)
             throws IOException, ClientProtocolException {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java Wed Jan 27 08:51:00 2016
@@ -56,6 +56,7 @@ public class DefaultProxyAuthenticationH
         super();
     }
 
+    @Override
     public boolean isAuthenticationRequested(
             final HttpResponse response,
             final HttpContext context) {
@@ -64,6 +65,7 @@ public class DefaultProxyAuthenticationH
         return status == HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED;
     }
 
+    @Override
     public Map<String, Header> getChallenges(
             final HttpResponse response,
             final HttpContext context) throws MalformedChallengeException {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java Wed Jan 27 08:51:00 2016
@@ -70,6 +70,7 @@ public class DefaultRedirectHandler impl
         super();
     }
 
+    @Override
     public boolean isRedirectRequested(
             final HttpResponse response,
             final HttpContext context) {
@@ -92,6 +93,7 @@ public class DefaultRedirectHandler impl
         } //end of switch
     }
 
+    @Override
     public URI getLocationURI(
             final HttpResponse response,
             final HttpContext context) throws ProtocolException {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java Wed Jan 27 08:51:00 2016
@@ -54,6 +54,7 @@ class DefaultRedirectStrategyAdaptor imp
         this.handler = handler;
     }
 
+    @Override
     public boolean isRedirected(
             final HttpRequest request,
             final HttpResponse response,
@@ -61,6 +62,7 @@ class DefaultRedirectStrategyAdaptor imp
         return this.handler.isRedirectRequested(response, context);
     }
 
+    @Override
     public HttpUriRequest getRedirect(
             final HttpRequest request,
             final HttpResponse response,

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java Wed Jan 27 08:51:00 2016
@@ -366,6 +366,7 @@ public class DefaultRequestDirector impl
 
 
     // non-javadoc, see interface ClientRequestDirector
+    @Override
     public HttpResponse execute(final HttpHost targetHost, final HttpRequest request,
                                 final HttpContext context)
         throws HttpException, IOException {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java Wed Jan 27 08:51:00 2016
@@ -56,6 +56,7 @@ public class DefaultTargetAuthentication
         super();
     }
 
+    @Override
     public boolean isAuthenticationRequested(
             final HttpResponse response,
             final HttpContext context) {
@@ -64,6 +65,7 @@ public class DefaultTargetAuthentication
         return status == HttpStatus.SC_UNAUTHORIZED;
     }
 
+    @Override
     public Map<String, Header> getChallenges(
             final HttpResponse response,
             final HttpContext context) throws MalformedChallengeException {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java Wed Jan 27 08:51:00 2016
@@ -156,6 +156,7 @@ public abstract class AbstractClientConn
         }
     }
 
+    @Override
     public boolean isOpen() {
         final OperatedClientConnection conn = getWrappedConnection();
         if (conn == null) {
@@ -165,6 +166,7 @@ public abstract class AbstractClientConn
         return conn.isOpen();
     }
 
+    @Override
     public boolean isStale() {
         if (isReleased()) {
             return true;
@@ -177,36 +179,42 @@ public abstract class AbstractClientConn
         return conn.isStale();
     }
 
+    @Override
     public void setSocketTimeout(final int timeout) {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         conn.setSocketTimeout(timeout);
     }
 
+    @Override
     public int getSocketTimeout() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.getSocketTimeout();
     }
 
+    @Override
     public HttpConnectionMetrics getMetrics() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.getMetrics();
     }
 
+    @Override
     public void flush() throws IOException {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         conn.flush();
     }
 
+    @Override
     public boolean isResponseAvailable(final int timeout) throws IOException {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.isResponseAvailable(timeout);
     }
 
+    @Override
     public void receiveResponseEntity(final HttpResponse response)
         throws HttpException, IOException {
         final OperatedClientConnection conn = getWrappedConnection();
@@ -215,6 +223,7 @@ public abstract class AbstractClientConn
         conn.receiveResponseEntity(response);
     }
 
+    @Override
     public HttpResponse receiveResponseHeader()
         throws HttpException, IOException {
         final OperatedClientConnection conn = getWrappedConnection();
@@ -223,6 +232,7 @@ public abstract class AbstractClientConn
         return conn.receiveResponseHeader();
     }
 
+    @Override
     public void sendRequestEntity(final HttpEntityEnclosingRequest request)
         throws HttpException, IOException {
         final OperatedClientConnection conn = getWrappedConnection();
@@ -231,6 +241,7 @@ public abstract class AbstractClientConn
         conn.sendRequestEntity(request);
     }
 
+    @Override
     public void sendRequestHeader(final HttpRequest request)
         throws HttpException, IOException {
         final OperatedClientConnection conn = getWrappedConnection();
@@ -239,40 +250,47 @@ public abstract class AbstractClientConn
         conn.sendRequestHeader(request);
     }
 
+    @Override
     public InetAddress getLocalAddress() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.getLocalAddress();
     }
 
+    @Override
     public int getLocalPort() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.getLocalPort();
     }
 
+    @Override
     public InetAddress getRemoteAddress() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.getRemoteAddress();
     }
 
+    @Override
     public int getRemotePort() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.getRemotePort();
     }
 
+    @Override
     public boolean isSecure() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
         return conn.isSecure();
     }
 
+    @Override
     public void bind(final Socket socket) throws IOException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Socket getSocket() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
@@ -282,6 +300,7 @@ public abstract class AbstractClientConn
         return conn.getSocket();
     }
 
+    @Override
     public SSLSession getSSLSession() {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
@@ -297,18 +316,22 @@ public abstract class AbstractClientConn
         return result;
     }
 
+    @Override
     public void markReusable() {
         markedReusable = true;
     }
 
+    @Override
     public void unmarkReusable() {
         markedReusable = false;
     }
 
+    @Override
     public boolean isMarkedReusable() {
         return markedReusable;
     }
 
+    @Override
     public void setIdleDuration(final long duration, final TimeUnit unit) {
         if(duration > 0) {
             this.duration = unit.toMillis(duration);
@@ -317,6 +340,7 @@ public abstract class AbstractClientConn
         }
     }
 
+    @Override
     public synchronized void releaseConnection() {
         if (released) {
             return;
@@ -325,6 +349,7 @@ public abstract class AbstractClientConn
         connManager.releaseConnection(this, duration, TimeUnit.MILLISECONDS);
     }
 
+    @Override
     public synchronized void abortConnection() {
         if (released) {
             return;
@@ -338,6 +363,7 @@ public abstract class AbstractClientConn
         connManager.releaseConnection(this, duration, TimeUnit.MILLISECONDS);
     }
 
+    @Override
     public Object getAttribute(final String id) {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
@@ -348,6 +374,7 @@ public abstract class AbstractClientConn
         }
     }
 
+    @Override
     public Object removeAttribute(final String id) {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);
@@ -358,6 +385,7 @@ public abstract class AbstractClientConn
         }
     }
 
+    @Override
     public void setAttribute(final String id, final Object obj) {
         final OperatedClientConnection conn = getWrappedConnection();
         assertValid(conn);

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java Wed Jan 27 08:51:00 2016
@@ -67,6 +67,7 @@ public abstract class AbstractPooledConn
         this.poolEntry = entry;
     }
 
+    @Override
     public String getId() {
         return null;
     }
@@ -117,12 +118,14 @@ public abstract class AbstractPooledConn
         super.detach();
     }
 
+    @Override
     public HttpRoute getRoute() {
         final AbstractPoolEntry entry = getPoolEntry();
         assertValid(entry);
         return (entry.tracker == null) ? null : entry.tracker.toRoute();
     }
 
+    @Override
     public void open(final HttpRoute route,
                      final HttpContext context, final HttpParams params)
         throws IOException {
@@ -131,6 +134,7 @@ public abstract class AbstractPooledConn
         entry.open(route, context, params);
     }
 
+    @Override
     public void tunnelTarget(final boolean secure, final HttpParams params)
         throws IOException {
         final AbstractPoolEntry entry = getPoolEntry();
@@ -138,6 +142,7 @@ public abstract class AbstractPooledConn
         entry.tunnelTarget(secure, params);
     }
 
+    @Override
     public void tunnelProxy(final HttpHost next, final boolean secure, final HttpParams params)
         throws IOException {
         final AbstractPoolEntry entry = getPoolEntry();
@@ -145,6 +150,7 @@ public abstract class AbstractPooledConn
         entry.tunnelProxy(next, secure, params);
     }
 
+    @Override
     public void layerProtocol(final HttpContext context, final HttpParams params)
         throws IOException {
         final AbstractPoolEntry entry = getPoolEntry();
@@ -152,6 +158,7 @@ public abstract class AbstractPooledConn
         entry.layerProtocol(context, params);
     }
 
+    @Override
     public void close() throws IOException {
         final AbstractPoolEntry entry = getPoolEntry();
         if (entry != null) {
@@ -164,6 +171,7 @@ public abstract class AbstractPooledConn
         }
     }
 
+    @Override
     public void shutdown() throws IOException {
         final AbstractPoolEntry entry = getPoolEntry();
         if (entry != null) {
@@ -176,12 +184,14 @@ public abstract class AbstractPooledConn
         }
     }
 
+    @Override
     public Object getState() {
         final AbstractPoolEntry entry = getPoolEntry();
         assertValid(entry);
         return entry.getState();
     }
 
+    @Override
     public void setState(final Object state) {
         final AbstractPoolEntry entry = getPoolEntry();
         assertValid(entry);

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java Wed Jan 27 08:51:00 2016
@@ -121,6 +121,7 @@ public class BasicClientConnectionManage
         }
     }
 
+    @Override
     public SchemeRegistry getSchemeRegistry() {
         return this.schemeRegistry;
     }
@@ -129,16 +130,19 @@ public class BasicClientConnectionManage
         return new DefaultClientConnectionOperator(schreg);
     }
 
+    @Override
     public final ClientConnectionRequest requestConnection(
             final HttpRoute route,
             final Object state) {
 
         return new ClientConnectionRequest() {
 
+            @Override
             public void abortRequest() {
                 // Nothing to abort, since requests are immediate.
             }
 
+            @Override
             public ManagedClientConnection getConnection(
                     final long timeout, final TimeUnit tunit) {
                 return BasicClientConnectionManager.this.getConnection(
@@ -189,6 +193,7 @@ public class BasicClientConnectionManage
         }
     }
 
+    @Override
     public void releaseConnection(final ManagedClientConnection conn, final long keepalive, final TimeUnit tunit) {
         Args.check(conn instanceof ManagedClientConnectionImpl, "Connection class mismatch, " +
             "connection not obtained from this manager");
@@ -234,6 +239,7 @@ public class BasicClientConnectionManage
         }
     }
 
+    @Override
     public void closeExpiredConnections() {
         synchronized (this) {
             assertNotShutdown();
@@ -245,6 +251,7 @@ public class BasicClientConnectionManage
         }
     }
 
+    @Override
     public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
         Args.notNull(tunit, "Time unit");
         synchronized (this) {
@@ -261,6 +268,7 @@ public class BasicClientConnectionManage
         }
     }
 
+    @Override
     public void shutdown() {
         synchronized (this) {
             this.shutdown = true;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java Wed Jan 27 08:51:00 2016
@@ -93,14 +93,17 @@ public class DefaultClientConnection ext
         this.attributes = new HashMap<String, Object>();
     }
 
+    @Override
     public String getId() {
         return null;
     }
 
+    @Override
     public final HttpHost getTargetHost() {
         return this.targetHost;
     }
 
+    @Override
     public final boolean isSecure() {
         return this.connSecure;
     }
@@ -110,6 +113,7 @@ public class DefaultClientConnection ext
         return this.socket;
     }
 
+    @Override
     public SSLSession getSSLSession() {
         if (this.socket instanceof SSLSocket) {
             return ((SSLSocket) this.socket).getSession();
@@ -118,6 +122,7 @@ public class DefaultClientConnection ext
         }
     }
 
+    @Override
     public void opening(final Socket sock, final HttpHost target) throws IOException {
         assertNotOpen();
         this.socket = sock;
@@ -131,6 +136,7 @@ public class DefaultClientConnection ext
         }
     }
 
+    @Override
     public void openCompleted(final boolean secure, final HttpParams params) throws IOException {
         Args.notNull(params, "Parameters");
         assertNotOpen();
@@ -226,10 +232,12 @@ public class DefaultClientConnection ext
             (buffer, null, responseFactory, params);
     }
 
+    @Override
     public void bind(final Socket socket) throws IOException {
         bind(socket, new BasicHttpParams());
     }
 
+    @Override
     public void update(final Socket sock, final HttpHost target,
                        final boolean secure, final HttpParams params)
         throws IOException {
@@ -277,14 +285,17 @@ public class DefaultClientConnection ext
         }
     }
 
+    @Override
     public Object getAttribute(final String id) {
         return this.attributes.get(id);
     }
 
+    @Override
     public Object removeAttribute(final String id) {
         return this.attributes.remove(id);
     }
 
+    @Override
     public void setAttribute(final String id, final Object obj) {
         this.attributes.put(id, obj);
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java Wed Jan 27 08:51:00 2016
@@ -128,6 +128,7 @@ public class DefaultClientConnectionOper
         this.dnsResolver = dnsResolver;
     }
 
+    @Override
     public OperatedClientConnection createConnection() {
         return new DefaultClientConnection();
     }
@@ -141,6 +142,7 @@ public class DefaultClientConnectionOper
         return reg;
     }
 
+    @Override
     public void openConnection(
             final OperatedClientConnection conn,
             final HttpHost target,
@@ -198,6 +200,7 @@ public class DefaultClientConnectionOper
         }
     }
 
+    @Override
     public void updateSecureConnection(
             final OperatedClientConnection conn,
             final HttpHost target,

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java Wed Jan 27 08:51:00 2016
@@ -78,6 +78,7 @@ public class DefaultHttpRoutePlanner imp
         schemeRegistry = schreg;
     }
 
+    @Override
     public HttpRoute determineRoute(final HttpHost target,
                                     final HttpRequest request,
                                     final HttpContext context)

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/HttpConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/HttpConnPool.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/HttpConnPool.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/HttpConnPool.java Wed Jan 27 08:51:00 2016
@@ -75,6 +75,7 @@ class HttpConnPool extends AbstractConnP
             this.connOperator = connOperator;
         }
 
+        @Override
         public OperatedClientConnection create(final HttpRoute route) throws IOException {
             return connOperator.createConnection();
         }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java Wed Jan 27 08:51:00 2016
@@ -75,10 +75,12 @@ public class LoggingSessionInputBuffer i
         this(in, wire, null);
     }
 
+    @Override
     public boolean isDataAvailable(final int timeout) throws IOException {
         return this.in.isDataAvailable(timeout);
     }
 
+    @Override
     public int read(final byte[] b, final int off, final int len) throws IOException {
         final int l = this.in.read(b,  off,  len);
         if (this.wire.enabled() && l > 0) {
@@ -87,6 +89,7 @@ public class LoggingSessionInputBuffer i
         return l;
     }
 
+    @Override
     public int read() throws IOException {
         final int l = this.in.read();
         if (this.wire.enabled() && l != -1) {
@@ -95,6 +98,7 @@ public class LoggingSessionInputBuffer i
         return l;
     }
 
+    @Override
     public int read(final byte[] b) throws IOException {
         final int l = this.in.read(b);
         if (this.wire.enabled() && l > 0) {
@@ -103,6 +107,7 @@ public class LoggingSessionInputBuffer i
         return l;
     }
 
+    @Override
     public String readLine() throws IOException {
         final String s = this.in.readLine();
         if (this.wire.enabled() && s != null) {
@@ -112,6 +117,7 @@ public class LoggingSessionInputBuffer i
         return s;
     }
 
+    @Override
     public int readLine(final CharArrayBuffer buffer) throws IOException {
         final int l = this.in.readLine(buffer);
         if (this.wire.enabled() && l >= 0) {
@@ -123,10 +129,12 @@ public class LoggingSessionInputBuffer i
         return l;
     }
 
+    @Override
     public HttpTransportMetrics getMetrics() {
         return this.in.getMetrics();
     }
 
+    @Override
     public boolean isEof() {
         if (this.eofSensor != null) {
             return this.eofSensor.isEof();

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java Wed Jan 27 08:51:00 2016
@@ -69,6 +69,7 @@ public class LoggingSessionOutputBuffer
         this(out, wire, null);
     }
 
+    @Override
     public void write(final byte[] b, final int off, final int len) throws IOException {
         this.out.write(b,  off,  len);
         if (this.wire.enabled()) {
@@ -76,6 +77,7 @@ public class LoggingSessionOutputBuffer
         }
     }
 
+    @Override
     public void write(final int b) throws IOException {
         this.out.write(b);
         if (this.wire.enabled()) {
@@ -83,6 +85,7 @@ public class LoggingSessionOutputBuffer
         }
     }
 
+    @Override
     public void write(final byte[] b) throws IOException {
         this.out.write(b);
         if (this.wire.enabled()) {
@@ -90,10 +93,12 @@ public class LoggingSessionOutputBuffer
         }
     }
 
+    @Override
     public void flush() throws IOException {
         this.out.flush();
     }
 
+    @Override
     public void writeLine(final CharArrayBuffer buffer) throws IOException {
         this.out.writeLine(buffer);
         if (this.wire.enabled()) {
@@ -103,6 +108,7 @@ public class LoggingSessionOutputBuffer
         }
     }
 
+    @Override
     public void writeLine(final String s) throws IOException {
         this.out.writeLine(s);
         if (this.wire.enabled()) {
@@ -111,6 +117,7 @@ public class LoggingSessionOutputBuffer
         }
     }
 
+    @Override
     public HttpTransportMetrics getMetrics() {
         return this.out.getMetrics();
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java Wed Jan 27 08:51:00 2016
@@ -83,6 +83,7 @@ class ManagedClientConnectionImpl implem
         this.duration = Long.MAX_VALUE;
     }
 
+    @Override
     public String getId() {
         return null;
     }
@@ -125,6 +126,7 @@ class ManagedClientConnectionImpl implem
         return local;
     }
 
+    @Override
     public void close() throws IOException {
         final HttpPoolEntry local = this.poolEntry;
         if (local != null) {
@@ -134,6 +136,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public void shutdown() throws IOException {
         final HttpPoolEntry local = this.poolEntry;
         if (local != null) {
@@ -143,6 +146,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public boolean isOpen() {
         final OperatedClientConnection conn = getConnection();
         if (conn != null) {
@@ -152,6 +156,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public boolean isStale() {
         final OperatedClientConnection conn = getConnection();
         if (conn != null) {
@@ -161,88 +166,105 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public void setSocketTimeout(final int timeout) {
         final OperatedClientConnection conn = ensureConnection();
         conn.setSocketTimeout(timeout);
     }
 
+    @Override
     public int getSocketTimeout() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.getSocketTimeout();
     }
 
+    @Override
     public HttpConnectionMetrics getMetrics() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.getMetrics();
     }
 
+    @Override
     public void flush() throws IOException {
         final OperatedClientConnection conn = ensureConnection();
         conn.flush();
     }
 
+    @Override
     public boolean isResponseAvailable(final int timeout) throws IOException {
         final OperatedClientConnection conn = ensureConnection();
         return conn.isResponseAvailable(timeout);
     }
 
+    @Override
     public void receiveResponseEntity(
             final HttpResponse response) throws HttpException, IOException {
         final OperatedClientConnection conn = ensureConnection();
         conn.receiveResponseEntity(response);
     }
 
+    @Override
     public HttpResponse receiveResponseHeader() throws HttpException, IOException {
         final OperatedClientConnection conn = ensureConnection();
         return conn.receiveResponseHeader();
     }
 
+    @Override
     public void sendRequestEntity(
             final HttpEntityEnclosingRequest request) throws HttpException, IOException {
         final OperatedClientConnection conn = ensureConnection();
         conn.sendRequestEntity(request);
     }
 
+    @Override
     public void sendRequestHeader(
             final HttpRequest request) throws HttpException, IOException {
         final OperatedClientConnection conn = ensureConnection();
         conn.sendRequestHeader(request);
     }
 
+    @Override
     public InetAddress getLocalAddress() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.getLocalAddress();
     }
 
+    @Override
     public int getLocalPort() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.getLocalPort();
     }
 
+    @Override
     public InetAddress getRemoteAddress() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.getRemoteAddress();
     }
 
+    @Override
     public int getRemotePort() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.getRemotePort();
     }
 
+    @Override
     public boolean isSecure() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.isSecure();
     }
 
+    @Override
     public void bind(final Socket socket) throws IOException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Socket getSocket() {
         final OperatedClientConnection conn = ensureConnection();
         return conn.getSocket();
     }
 
+    @Override
     public SSLSession getSSLSession() {
         final OperatedClientConnection conn = ensureConnection();
         SSLSession result = null;
@@ -278,11 +300,13 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public HttpRoute getRoute() {
         final HttpPoolEntry local = ensurePoolEntry();
         return local.getEffectiveRoute();
     }
 
+    @Override
     public void open(
             final HttpRoute route,
             final HttpContext context,
@@ -320,6 +344,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public void tunnelTarget(
             final boolean secure, final HttpParams params) throws IOException {
         Args.notNull(params, "HTTP parameters");
@@ -348,6 +373,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public void tunnelProxy(
             final HttpHost next, final boolean secure, final HttpParams params) throws IOException {
         Args.notNull(next, "Next proxy");
@@ -374,6 +400,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public void layerProtocol(
             final HttpContext context, final HttpParams params) throws IOException {
         Args.notNull(params, "HTTP parameters");
@@ -402,28 +429,34 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public Object getState() {
         final HttpPoolEntry local = ensurePoolEntry();
         return local.getState();
     }
 
+    @Override
     public void setState(final Object state) {
         final HttpPoolEntry local = ensurePoolEntry();
         local.setState(state);
     }
 
+    @Override
     public void markReusable() {
         this.reusable = true;
     }
 
+    @Override
     public void unmarkReusable() {
         this.reusable = false;
     }
 
+    @Override
     public boolean isMarkedReusable() {
         return this.reusable;
     }
 
+    @Override
     public void setIdleDuration(final long duration, final TimeUnit unit) {
         if(duration > 0) {
             this.duration = unit.toMillis(duration);
@@ -432,6 +465,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public void releaseConnection() {
         synchronized (this) {
             if (this.poolEntry == null) {
@@ -442,6 +476,7 @@ class ManagedClientConnectionImpl implem
         }
     }
 
+    @Override
     public void abortConnection() {
         synchronized (this) {
             if (this.poolEntry == null) {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java Wed Jan 27 08:51:00 2016
@@ -138,6 +138,7 @@ public class PoolingClientConnectionMana
             return new DefaultClientConnectionOperator(schreg, this.dnsResolver);
     }
 
+    @Override
     public SchemeRegistry getSchemeRegistry() {
         return this.schemeRegistry;
     }
@@ -174,6 +175,7 @@ public class PoolingClientConnectionMana
         return buf.toString();
     }
 
+    @Override
     public ClientConnectionRequest requestConnection(
             final HttpRoute route,
             final Object state) {
@@ -185,10 +187,12 @@ public class PoolingClientConnectionMana
 
         return new ClientConnectionRequest() {
 
+            @Override
             public void abortRequest() {
                 future.cancel(true);
             }
 
+            @Override
             public ManagedClientConnection getConnection(
                     final long timeout,
                     final TimeUnit tunit) throws InterruptedException, ConnectionPoolTimeoutException {
@@ -227,6 +231,7 @@ public class PoolingClientConnectionMana
         }
     }
 
+    @Override
     public void releaseConnection(
             final ManagedClientConnection conn, final long keepalive, final TimeUnit tunit) {
 
@@ -271,6 +276,7 @@ public class PoolingClientConnectionMana
         }
     }
 
+    @Override
     public void shutdown() {
         this.log.debug("Connection manager is shutting down");
         try {
@@ -281,6 +287,7 @@ public class PoolingClientConnectionMana
         this.log.debug("Connection manager shut down");
     }
 
+    @Override
     public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
         if (this.log.isDebugEnabled()) {
             this.log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
@@ -288,39 +295,48 @@ public class PoolingClientConnectionMana
         this.pool.closeIdle(idleTimeout, tunit);
     }
 
+    @Override
     public void closeExpiredConnections() {
         this.log.debug("Closing expired connections");
         this.pool.closeExpired();
     }
 
+    @Override
     public int getMaxTotal() {
         return this.pool.getMaxTotal();
     }
 
+    @Override
     public void setMaxTotal(final int max) {
         this.pool.setMaxTotal(max);
     }
 
+    @Override
     public int getDefaultMaxPerRoute() {
         return this.pool.getDefaultMaxPerRoute();
     }
 
+    @Override
     public void setDefaultMaxPerRoute(final int max) {
         this.pool.setDefaultMaxPerRoute(max);
     }
 
+    @Override
     public int getMaxPerRoute(final HttpRoute route) {
         return this.pool.getMaxPerRoute(route);
     }
 
+    @Override
     public void setMaxPerRoute(final HttpRoute route, final int max) {
         this.pool.setMaxPerRoute(route, max);
     }
 
+    @Override
     public PoolStats getTotalStats() {
         return this.pool.getTotalStats();
     }
 
+    @Override
     public PoolStats getStats(final HttpRoute route) {
         return this.pool.getStats(route);
     }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java Wed Jan 27 08:51:00 2016
@@ -114,6 +114,7 @@ public class ProxySelectorRoutePlanner i
         this.proxySelector = prosel;
     }
 
+    @Override
     public HttpRoute determineRoute(final HttpHost target,
                                     final HttpRequest request,
                                     final HttpContext context)

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java Wed Jan 27 08:51:00 2016
@@ -145,6 +145,7 @@ public class SingleClientConnManager imp
         }
     }
 
+    @Override
     public SchemeRegistry getSchemeRegistry() {
         return this.schemeRegistry;
     }
@@ -175,16 +176,19 @@ public class SingleClientConnManager imp
         Asserts.check(!this.isShutDown, "Manager is shut down");
     }
 
+    @Override
     public final ClientConnectionRequest requestConnection(
             final HttpRoute route,
             final Object state) {
 
         return new ClientConnectionRequest() {
 
+            @Override
             public void abortRequest() {
                 // Nothing to abort, since requests are immediate.
             }
 
+            @Override
             public ManagedClientConnection getConnection(
                     final long timeout, final TimeUnit tunit) {
                 return SingleClientConnManager.this.getConnection(
@@ -253,6 +257,7 @@ public class SingleClientConnManager imp
         }
     }
 
+    @Override
     public void releaseConnection(
             final ManagedClientConnection conn,
             final long validDuration, final TimeUnit timeUnit) {
@@ -307,6 +312,7 @@ public class SingleClientConnManager imp
         }
     }
 
+    @Override
     public void closeExpiredConnections() {
         final long time = connectionExpiresTime;
         if (System.currentTimeMillis() >= time) {
@@ -314,6 +320,7 @@ public class SingleClientConnManager imp
         }
     }
 
+    @Override
     public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
         assertStillUp();
 
@@ -336,6 +343,7 @@ public class SingleClientConnManager imp
         }
     }
 
+    @Override
     public void shutdown() {
         this.isShutDown = true;
         synchronized (this) {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Wed Jan 27 08:51:00 2016
@@ -282,6 +282,7 @@ public class ConnPoolByRoute extends Abs
 
         return new PoolEntryRequest() {
 
+            @Override
             public void abortRequest() {
                 poolLock.lock();
                 try {
@@ -291,6 +292,7 @@ public class ConnPoolByRoute extends Abs
                 }
             }
 
+            @Override
             public BasicPoolEntry getPoolEntry(
                     final long timeout,
                     final TimeUnit tunit)

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java Wed Jan 27 08:51:00 2016
@@ -84,6 +84,7 @@ public class RouteSpecificPool {
         this.route = route;
         this.maxEntries = maxEntries;
         this.connPerRoute = new ConnPerRoute() {
+            @Override
             public int getMaxForRoute(final HttpRoute unused) {
                 return RouteSpecificPool.this.maxEntries;
             }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java Wed Jan 27 08:51:00 2016
@@ -209,10 +209,12 @@ public class ThreadSafeClientConnManager
         return new DefaultClientConnectionOperator(schreg);// @ThreadSafe
     }
 
+    @Override
     public SchemeRegistry getSchemeRegistry() {
         return this.schemeRegistry;
     }
 
+    @Override
     public ClientConnectionRequest requestConnection(
             final HttpRoute route,
             final Object state) {
@@ -222,10 +224,12 @@ public class ThreadSafeClientConnManager
 
         return new ClientConnectionRequest() {
 
+            @Override
             public void abortRequest() {
                 poolRequest.abortRequest();
             }
 
+            @Override
             public ManagedClientConnection getConnection(
                     final long timeout, final TimeUnit tunit) throws InterruptedException,
                     ConnectionPoolTimeoutException {
@@ -243,6 +247,7 @@ public class ThreadSafeClientConnManager
 
     }
 
+    @Override
     public void releaseConnection(final ManagedClientConnection conn, final long validDuration, final TimeUnit timeUnit) {
         Args.check(conn instanceof BasicPooledConnAdapter, "Connection class mismatch, " +
                 "connection not obtained from this manager");
@@ -288,6 +293,7 @@ public class ThreadSafeClientConnManager
         }
     }
 
+    @Override
     public void shutdown() {
         log.debug("Shutting down");
         pool.shutdown();
@@ -319,6 +325,7 @@ public class ThreadSafeClientConnManager
         return pool.getConnectionsInPool();
     }
 
+    @Override
     public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
         if (log.isDebugEnabled()) {
             log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
@@ -326,6 +333,7 @@ public class ThreadSafeClientConnManager
         pool.closeIdleConnections(idleTimeout, tunit);
     }
 
+    @Override
     public void closeExpiredConnections() {
         log.debug("Closing expired connections");
         pool.closeExpiredConnections();

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/KerberosCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/KerberosCredentials.java?rev=1726962&r1=1726961&r2=1726962&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/KerberosCredentials.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/KerberosCredentials.java Wed Jan 27 08:51:00 2016
@@ -58,10 +58,12 @@ public class KerberosCredentials impleme
         return gssCredential;
     }
 
+    @Override
     public Principal getUserPrincipal() {
         return null;
     }
 
+    @Override
     public String getPassword() {
         return null;
     }




Mime
View raw message