hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1561063 [2/4] - in /httpcomponents/httpclient/trunk: fluent-hc/src/examples/org/apache/http/client/fluent/ fluent-hc/src/main/java/org/apache/http/client/fluent/ httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ httpclient-...
Date Fri, 24 Jan 2014 17:02:10 GMT
Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java Fri Jan 24 17:02:05 2014
@@ -120,6 +120,7 @@ final class OSGiHttpRoutePlanner extends
             this.hostName = hostName;
         }
 
+        @Override
         public boolean matches(final String host) {
             return hostName.equalsIgnoreCase(host);
         }
@@ -133,6 +134,7 @@ final class OSGiHttpRoutePlanner extends
             this.domainName = domainName.toLowerCase(Locale.ENGLISH);
         }
 
+        @Override
         public boolean matches(final String host) {
             return host.toLowerCase(Locale.ENGLISH).endsWith(domainName);
         }
@@ -146,6 +148,7 @@ final class OSGiHttpRoutePlanner extends
             this.address = address;
         }
 
+        @Override
         public boolean matches(final String host) {
             final NetworkAddress hostAddress = NetworkAddress.parse(host);
             return hostAddress != null && address.address == (hostAddress.address & address.mask);

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiProxyConfiguration.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiProxyConfiguration.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiProxyConfiguration.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiProxyConfiguration.java Fri Jan 24 17:02:05 2014
@@ -93,26 +93,32 @@ public final class OSGiProxyConfiguratio
 
     private String[] proxyExceptions;
 
+    @Override
     public boolean isEnabled() {
         return enabled;
     }
 
+    @Override
     public String getHostname() {
         return hostname;
     }
 
+    @Override
     public int getPort() {
         return port;
     }
 
+    @Override
     public String getUsername() {
         return username;
     }
 
+    @Override
     public String getPassword() {
         return password;
     }
 
+    @Override
     public String[] getProxyExceptions() {
         return proxyExceptions;
     }

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/PropertiesUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/PropertiesUtils.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/PropertiesUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/PropertiesUtils.java Fri Jan 24 17:02:05 2014
@@ -119,6 +119,7 @@ final class PropertiesUtils {
 
     private static class BooleanPropertyConverter implements PropertyConverter<Boolean> {
 
+        @Override
         public Boolean to(final Object propValue) {
             return Boolean.valueOf(String.valueOf(propValue));
         }
@@ -127,6 +128,7 @@ final class PropertiesUtils {
 
     private static class StringPropertyConverter implements PropertyConverter<String> {
 
+        @Override
         public String to(final Object propValue) {
             return String.valueOf(propValue);
         }
@@ -135,6 +137,7 @@ final class PropertiesUtils {
 
     private static class StringArrayPropertyConverter implements PropertyConverter<String[]> {
 
+        @Override
         public String[] to(final Object propValue) {
             if (propValue instanceof String) {
                 // single string
@@ -174,6 +177,7 @@ final class PropertiesUtils {
 
     private static class IntegerPropertyConverter implements PropertyConverter<Integer> {
 
+        @Override
         public Integer to(final Object propValue) {
             return Integer.valueOf(String.valueOf(propValue));
         }
@@ -182,6 +186,7 @@ final class PropertiesUtils {
 
     private static class LongPropertyConverter implements PropertyConverter<Long> {
 
+        @Override
         public Long to(final Object propValue) {
             return Long.valueOf(String.valueOf(propValue));
         }
@@ -190,6 +195,7 @@ final class PropertiesUtils {
 
     private static class DoublePropertyConverter implements PropertyConverter<Double> {
 
+        @Override
         public Double to(final Object propValue) {
             return Double.valueOf(String.valueOf(propValue));
         }

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java Fri Jan 24 17:02:05 2014
@@ -68,6 +68,7 @@ public class CurrentWindowsCredentials i
         return LazyHolder.INSTANCE;
     }
 
+    @Override
     public Principal getUserPrincipal() {
         return this;
     }
@@ -94,10 +95,12 @@ public class CurrentWindowsCredentials i
     /**
      * Returns an empty password
      */
+    @Override
     public String getPassword() {
         return "";
     }
 
+    @Override
     public String getName() {
         return getCurrentUsername();
     }

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java Fri Jan 24 17:02:05 2014
@@ -44,6 +44,7 @@ import org.apache.http.protocol.HttpCont
 @Immutable
 public class WindowsNTLMSchemeFactory implements AuthSchemeProvider {
 
+    @Override
     public AuthScheme create(final HttpContext context) {
         return new WindowsNegotiateScheme(AuthSchemes.NTLM);
     }

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java Fri Jan 24 17:02:05 2014
@@ -118,20 +118,24 @@ public class WindowsNegotiateScheme exte
         super.finalize();
     }
 
+    @Override
     public String getSchemeName() {
         return scheme;
     }
 
     // String parameters not supported
+    @Override
     public String getParameter(final String name) {
         return null;
     }
 
     // NTLM/Negotiate do not support authentication realms
+    @Override
     public String getRealm() {
         return null;
     }
 
+    @Override
     public boolean isConnectionBased() {
         return true;
     }
@@ -247,10 +251,12 @@ public class WindowsNegotiateScheme exte
         return Base64.encodeBase64String(token.getBytes());
     }
 
+    @Override
     public boolean isComplete() {
         return !continueNeeded;
     }
 
+    @Override
     @Deprecated
     public Header authenticate(
             final Credentials credentials,

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java Fri Jan 24 17:02:05 2014
@@ -44,6 +44,7 @@ import org.apache.http.protocol.HttpCont
 @Immutable
 public class WindowsNegotiateSchemeFactory implements AuthSchemeProvider {
 
+    @Override
     public AuthScheme create(final HttpContext context) {
         return new WindowsNegotiateScheme(AuthSchemes.SPNEGO);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java Fri Jan 24 17:02:05 2014
@@ -86,12 +86,14 @@ public class ClientExecuteSOCKS {
 
     static class MyConnectionSocketFactory implements ConnectionSocketFactory {
 
+        @Override
         public Socket createSocket(final HttpContext context) throws IOException {
             InetSocketAddress socksaddr = (InetSocketAddress) context.getAttribute("socks.address");
             Proxy proxy = new Proxy(Proxy.Type.SOCKS, socksaddr);
             return new Socket(proxy);
         }
 
+        @Override
         public Socket connectSocket(
                 final int connectTimeout,
                 final Socket socket,

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java Fri Jan 24 17:02:05 2014
@@ -56,6 +56,7 @@ public class ClientWithRequestFuture {
         try {
             // Because things are asynchronous, you must provide a ResponseHandler
             ResponseHandler<Boolean> handler = new ResponseHandler<Boolean>() {
+                @Override
                 public Boolean handleResponse(HttpResponse response) throws ClientProtocolException, IOException {
                     // simply return true if the status was OK
                     return response.getStatusLine().getStatusCode() == 200;
@@ -89,14 +90,17 @@ public class ClientWithRequestFuture {
             System.out.println("It was ok? "  + wasItOk3);
 
             FutureCallback<Boolean> callback = new FutureCallback<Boolean>() {
+                @Override
                 public void completed(Boolean result) {
                     System.out.println("completed with " + result);
                 }
 
+                @Override
                 public void failed(Exception ex) {
                     System.out.println("failed with " + ex.getMessage());
                 }
 
+                @Override
                 public void cancelled() {
                     System.out.println("cancelled");
                 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java Fri Jan 24 17:02:05 2014
@@ -54,6 +54,7 @@ public class ClientWithResponseHandler {
             // Create a custom response handler
             ResponseHandler<String> responseHandler = new ResponseHandler<String>() {
 
+                @Override
                 public String handleResponse(
                         final HttpResponse response) throws ClientProtocolException, IOException {
                     int status = response.getStatusLine().getStatusCode();

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java Fri Jan 24 17:02:05 2014
@@ -140,9 +140,11 @@ public final class AuthSchemeRegistry im
         registeredSchemes.putAll(map);
     }
 
+    @Override
     public AuthSchemeProvider lookup(final String name) {
         return new AuthSchemeProvider() {
 
+            @Override
             public AuthScheme create(final HttpContext context) {
                 final HttpRequest request = (HttpRequest) context.getAttribute(
                         ExecutionContext.HTTP_REQUEST);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java Fri Jan 24 17:02:05 2014
@@ -51,6 +51,7 @@ public final class BasicUserPrincipal im
         this.username = username;
     }
 
+    @Override
     public String getName() {
         return this.username;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java Fri Jan 24 17:02:05 2014
@@ -110,6 +110,7 @@ public class NTCredentials implements Cr
         }
     }
 
+    @Override
     public Principal getUserPrincipal() {
         return this.principal;
     }
@@ -118,6 +119,7 @@ public class NTCredentials implements Cr
         return this.principal.getUsername();
     }
 
+    @Override
     public String getPassword() {
         return this.password;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java Fri Jan 24 17:02:05 2014
@@ -70,6 +70,7 @@ public class NTUserPrincipal implements 
         }
     }
 
+    @Override
     public String getName() {
         return this.ntname;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java Fri Jan 24 17:02:05 2014
@@ -80,6 +80,7 @@ public class UsernamePasswordCredentials
         this.password = password;
     }
 
+    @Override
     public Principal getUserPrincipal() {
         return this.principal;
     }
@@ -88,6 +89,7 @@ public class UsernamePasswordCredentials
         return this.principal.getName();
     }
 
+    @Override
     public String getPassword() {
         return password;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java Fri Jan 24 17:02:05 2014
@@ -50,6 +50,7 @@ public abstract class AbstractExecutionA
         this.abortLock = new ReentrantLock();
     }
 
+    @Override
     @Deprecated
     public void setConnectionRequest(final ClientConnectionRequest connRequest) {
         if (this.aborted) {
@@ -59,6 +60,7 @@ public abstract class AbstractExecutionA
         try {
             this.cancellable = new Cancellable() {
 
+                @Override
                 public boolean cancel() {
                     connRequest.abortRequest();
                     return true;
@@ -70,6 +72,7 @@ public abstract class AbstractExecutionA
         }
     }
 
+    @Override
     @Deprecated
     public void setReleaseTrigger(final ConnectionReleaseTrigger releaseTrigger) {
         if (this.aborted) {
@@ -79,6 +82,7 @@ public abstract class AbstractExecutionA
         try {
             this.cancellable = new Cancellable() {
 
+                @Override
                 public boolean cancel() {
                     try {
                         releaseTrigger.abortConnection();
@@ -101,6 +105,7 @@ public abstract class AbstractExecutionA
         }
     }
 
+    @Override
     public void abort() {
         if (this.aborted) {
             return;
@@ -114,6 +119,7 @@ public abstract class AbstractExecutionA
         }
     }
 
+    @Override
     public boolean isAborted() {
         return this.aborted;
     }
@@ -121,6 +127,7 @@ public abstract class AbstractExecutionA
     /**
      * @since 4.2
      */
+    @Override
     public void setCancellable(final Cancellable cancellable) {
         if (this.aborted) {
             return;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java Fri Jan 24 17:02:05 2014
@@ -50,14 +50,17 @@ public abstract class HttpEntityEnclosin
         super();
     }
 
+    @Override
     public HttpEntity getEntity() {
         return this.entity;
     }
 
+    @Override
     public void setEntity(final HttpEntity entity) {
         this.entity = entity;
     }
 
+    @Override
     public boolean expectContinue() {
         final Header expect = getFirstHeader(HTTP.EXPECT_DIRECTIVE);
         return expect != null && HTTP.EXPECT_CONTINUE.equalsIgnoreCase(expect.getValue());

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java Fri Jan 24 17:02:05 2014
@@ -50,6 +50,7 @@ public abstract class HttpRequestBase ex
     private URI uri;
     private RequestConfig config;
 
+    @Override
     public abstract String getMethod();
 
     /**
@@ -59,6 +60,7 @@ public abstract class HttpRequestBase ex
         this.version = version;
     }
 
+    @Override
     public ProtocolVersion getProtocolVersion() {
         return version != null ? version : HttpProtocolParams.getVersion(getParams());
     }
@@ -69,10 +71,12 @@ public abstract class HttpRequestBase ex
      * Please note URI remains unchanged in the course of request execution and
      * is not updated if the request is redirected to another location.
      */
+    @Override
     public URI getURI() {
         return this.uri;
     }
 
+    @Override
     public RequestLine getRequestLine() {
         final String method = getMethod();
         final ProtocolVersion ver = getProtocolVersion();
@@ -88,6 +92,7 @@ public abstract class HttpRequestBase ex
     }
 
 
+    @Override
     public RequestConfig getConfig() {
         return config;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java Fri Jan 24 17:02:05 2014
@@ -69,6 +69,7 @@ public class HttpRequestWrapper extends 
         setHeaders(request.getAllHeaders());
     }
 
+    @Override
     public ProtocolVersion getProtocolVersion() {
         return this.version != null ? this.version : this.original.getProtocolVersion();
     }
@@ -77,6 +78,7 @@ public class HttpRequestWrapper extends 
         this.version = version;
     }
 
+    @Override
     public URI getURI() {
         return this.uri;
     }
@@ -85,18 +87,22 @@ public class HttpRequestWrapper extends 
         this.uri = uri;
     }
 
+    @Override
     public String getMethod() {
         return method;
     }
 
+    @Override
     public void abort() throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isAborted() {
         return false;
     }
 
+    @Override
     public RequestLine getRequestLine() {
         String requestUri = null;
         if (this.uri != null) {
@@ -129,14 +135,17 @@ public class HttpRequestWrapper extends 
             this.entity = request.getEntity();
         }
 
+        @Override
         public HttpEntity getEntity() {
             return this.entity;
         }
 
+        @Override
         public void setEntity(final HttpEntity entity) {
             this.entity = entity;
         }
 
+        @Override
         public boolean expectContinue() {
             final Header expect = getFirstHeader(HTTP.EXPECT_DIRECTIVE);
             return expect != null && HTTP.EXPECT_CONTINUE.equalsIgnoreCase(expect.getValue());

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java Fri Jan 24 17:02:05 2014
@@ -49,6 +49,7 @@ public class RequestAcceptEncoding imple
     /**
      * Adds the header {@code "Accept-Encoding: gzip,deflate"} to the request.
      */
+    @Override
     public void process(
             final HttpRequest request,
             final HttpContext context) throws HttpException, IOException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java Fri Jan 24 17:02:05 2014
@@ -73,6 +73,7 @@ public class RequestAddCookies implement
         super();
     }
 
+    @Override
     public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java Fri Jan 24 17:02:05 2014
@@ -63,6 +63,7 @@ public class RequestAuthCache implements
         super();
     }
 
+    @Override
     public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java Fri Jan 24 17:02:05 2014
@@ -58,6 +58,7 @@ public class RequestClientConnControl im
         super();
     }
 
+    @Override
     public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java Fri Jan 24 17:02:05 2014
@@ -62,6 +62,7 @@ public class RequestDefaultHeaders imple
         this(null);
     }
 
+    @Override
     public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestExpectContinue.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestExpectContinue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestExpectContinue.java Fri Jan 24 17:02:05 2014
@@ -58,6 +58,7 @@ public class RequestExpectContinue imple
         super();
     }
 
+    @Override
     public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java Fri Jan 24 17:02:05 2014
@@ -68,6 +68,7 @@ public class ResponseContentEncoding imp
      *
      * @throws HttpException if the {@code Content-Encoding} is none of the above
      */
+    @Override
     public void process(
             final HttpResponse response,
             final HttpContext context) throws HttpException, IOException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java Fri Jan 24 17:02:05 2014
@@ -62,6 +62,7 @@ public class ResponseProcessCookies impl
         super();
     }
 
+    @Override
     public void process(final HttpResponse response, final HttpContext context)
             throws HttpException, IOException {
         Args.notNull(response, "HTTP request");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java Fri Jan 24 17:02:05 2014
@@ -57,6 +57,7 @@ public class JdkIdn implements Idn {
         }
     }
 
+    @Override
     public String toUnicode(final String punycode) {
         try {
             return (String) toUnicode.invoke(null, punycode);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java Fri Jan 24 17:02:05 2014
@@ -76,6 +76,7 @@ public class Rfc3492Idn implements Idn {
         throw new IllegalArgumentException("illegal digit: "+ c);
     }
 
+    @Override
     public String toUnicode(final String punycode) {
         final StringBuilder unicode = new StringBuilder(punycode.length());
         final StringTokenizer tok = new StringTokenizer(punycode, ".");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java Fri Jan 24 17:02:05 2014
@@ -268,6 +268,7 @@ public class EofSensorInputStream extend
     /**
      * Same as {@link #close close()}.
      */
+    @Override
     public void releaseConnection() throws IOException {
         close();
     }
@@ -279,6 +280,7 @@ public class EofSensorInputStream extend
      * indicates that there should be no attempt to read until the end of
      * the stream.
      */
+    @Override
     public void abortConnection() throws IOException {
         // tolerate multiple calls
         selfClosed = true;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java Fri Jan 24 17:02:05 2014
@@ -58,6 +58,7 @@ public interface ManagedClientConnection
      * @return  <code>true</code> if this connection is secure,
      *          <code>false</code> otherwise
      */
+    @Override
     boolean isSecure();
 
     /**
@@ -66,6 +67,7 @@ public interface ManagedClientConnection
      * @return  the route established so far, or
      *          <code>null</code> if not connected
      */
+    @Override
     HttpRoute getRoute();
 
     /**
@@ -84,6 +86,7 @@ public interface ManagedClientConnection
      * @return  the underlying SSL session if available,
      *          <code>null</code> otherwise
      */
+    @Override
     SSLSession getSSLSession();
 
     /**

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java Fri Jan 24 17:02:05 2014
@@ -49,6 +49,7 @@ public class BasicRouteDirector implemen
      *          either the next step to perform, or success, or failure.
      *          0 is for success, a negative value for failure.
      */
+    @Override
     public int nextStep(final RouteInfo plan, final RouteInfo fact) {
         Args.notNull(plan, "Planned route");
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java Fri Jan 24 17:02:05 2014
@@ -185,10 +185,12 @@ public final class HttpRoute implements 
         this(target, null, proxy, false);
     }
 
+    @Override
     public final HttpHost getTargetHost() {
         return this.targetHost;
     }
 
+    @Override
     public final InetAddress getLocalAddress() {
         return this.localAddress;
     }
@@ -197,10 +199,12 @@ public final class HttpRoute implements 
         return this.localAddress != null ? new InetSocketAddress(this.localAddress, 0) : null;
     }
 
+    @Override
     public final int getHopCount() {
         return proxyChain != null ? proxyChain.size() + 1 : 1;
     }
 
+    @Override
     public final HttpHost getHopTarget(final int hop) {
         Args.notNegative(hop, "Hop index");
         final int hopcount = getHopCount();
@@ -212,26 +216,32 @@ public final class HttpRoute implements 
         }
     }
 
+    @Override
     public final HttpHost getProxyHost() {
         return proxyChain != null && !this.proxyChain.isEmpty() ? this.proxyChain.get(0) : null;
     }
 
+    @Override
     public final TunnelType getTunnelType() {
         return this.tunnelled;
     }
 
+    @Override
     public final boolean isTunnelled() {
         return (this.tunnelled == TunnelType.TUNNELLED);
     }
 
+    @Override
     public final LayerType getLayerType() {
         return this.layered;
     }
 
+    @Override
     public final boolean isLayered() {
         return (this.layered == LayerType.LAYERED);
     }
 
+    @Override
     public final boolean isSecure() {
         return this.secure;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java Fri Jan 24 17:02:05 2014
@@ -185,14 +185,17 @@ public final class RouteTracker implemen
         this.secure  = secure;
     }
 
+    @Override
     public final HttpHost getTargetHost() {
         return this.targetHost;
     }
 
+    @Override
     public final InetAddress getLocalAddress() {
         return this.localAddress;
     }
 
+    @Override
     public final int getHopCount() {
         int hops = 0;
         if (this.connected) {
@@ -205,6 +208,7 @@ public final class RouteTracker implemen
         return hops;
     }
 
+    @Override
     public final HttpHost getHopTarget(final int hop) {
         Args.notNegative(hop, "Hop index");
         final int hopcount = getHopCount();
@@ -219,6 +223,7 @@ public final class RouteTracker implemen
         return result;
     }
 
+    @Override
     public final HttpHost getProxyHost() {
         return (this.proxyChain == null) ? null : this.proxyChain[0];
     }
@@ -227,22 +232,27 @@ public final class RouteTracker implemen
         return this.connected;
     }
 
+    @Override
     public final TunnelType getTunnelType() {
         return this.tunnelled;
     }
 
+    @Override
     public final boolean isTunnelled() {
         return (this.tunnelled == TunnelType.TUNNELLED);
     }
 
+    @Override
     public final LayerType getLayerType() {
         return this.layered;
     }
 
+    @Override
     public final boolean isLayered() {
         return (this.layered == LayerType.LAYERED);
     }
 
+    @Override
     public final boolean isSecure() {
         return this.secure;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java Fri Jan 24 17:02:05 2014
@@ -44,6 +44,7 @@ class LayeredSocketFactoryAdaptor extend
         this.factory = factory;
     }
 
+    @Override
     public Socket createSocket(
             final Socket socket,
             final String host, final int port, final boolean autoClose) throws IOException, UnknownHostException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java Fri Jan 24 17:02:05 2014
@@ -47,6 +47,7 @@ class SchemeLayeredSocketFactoryAdaptor 
         this.factory = factory;
     }
 
+    @Override
     public Socket createLayeredSocket(
             final Socket socket,
             final String target, final int port,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java Fri Jan 24 17:02:05 2014
@@ -48,10 +48,12 @@ class SchemeLayeredSocketFactoryAdaptor2
         this.factory = factory;
     }
 
+    @Override
     public Socket createSocket(final HttpParams params) throws IOException {
         return this.factory.createSocket(params);
     }
 
+    @Override
     public Socket connectSocket(
             final Socket sock,
             final InetSocketAddress remoteAddress,
@@ -60,10 +62,12 @@ class SchemeLayeredSocketFactoryAdaptor2
         return this.factory.connectSocket(sock, remoteAddress, localAddress, params);
     }
 
+    @Override
     public boolean isSecure(final Socket sock) throws IllegalArgumentException {
         return this.factory.isSecure(sock);
     }
 
+    @Override
     public Socket createLayeredSocket(
             final Socket socket,
             final String target, final int port,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java Fri Jan 24 17:02:05 2014
@@ -49,6 +49,7 @@ class SchemeSocketFactoryAdaptor impleme
         this.factory = factory;
     }
 
+    @Override
     public Socket connectSocket(
             final Socket sock,
             final InetSocketAddress remoteAddress,
@@ -65,10 +66,12 @@ class SchemeSocketFactoryAdaptor impleme
         return this.factory.connectSocket(sock, host, port, local, localPort, params);
     }
 
+    @Override
     public Socket createSocket(final HttpParams params) throws IOException {
         return this.factory.createSocket();
     }
 
+    @Override
     public boolean isSecure(final Socket sock) throws IllegalArgumentException {
         return this.factory.isSecure(sock);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java Fri Jan 24 17:02:05 2014
@@ -47,11 +47,13 @@ class SocketFactoryAdaptor implements So
         this.factory = factory;
     }
 
+    @Override
     public Socket createSocket() throws IOException {
         final HttpParams params = new BasicHttpParams();
         return this.factory.createSocket(params);
     }
 
+    @Override
     public Socket connectSocket(
             final Socket socket,
             final String host, final int port,
@@ -66,6 +68,7 @@ class SocketFactoryAdaptor implements So
         return this.factory.connectSocket(socket, remote, local, params);
     }
 
+    @Override
     public boolean isSecure(final Socket socket) throws IllegalArgumentException {
         return this.factory.isSecure(socket);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/socket/PlainConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/socket/PlainConnectionSocketFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/socket/PlainConnectionSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/socket/PlainConnectionSocketFactory.java Fri Jan 24 17:02:05 2014
@@ -53,10 +53,12 @@ public class PlainConnectionSocketFactor
         super();
     }
 
+    @Override
     public Socket createSocket(final HttpContext context) throws IOException {
         return new Socket();
     }
 
+    @Override
     public Socket connectSocket(
             final int connectTimeout,
             final Socket socket,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java Fri Jan 24 17:02:05 2014
@@ -85,6 +85,7 @@ public abstract class AbstractVerifier i
         super();
     }
 
+    @Override
     public final void verify(final String host, final SSLSocket ssl)
           throws IOException {
         if(host == null) {
@@ -133,6 +134,7 @@ public abstract class AbstractVerifier i
         verify(host, x509);
     }
 
+    @Override
     public final boolean verify(final String host, final SSLSession session) {
         try {
             final Certificate[] certs = session.getPeerCertificates();
@@ -145,6 +147,7 @@ public abstract class AbstractVerifier i
         }
     }
 
+    @Override
     public final void verify(final String host, final X509Certificate cert)
           throws SSLException {
         final String[] cns = getCNs(cert);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java Fri Jan 24 17:02:05 2014
@@ -39,6 +39,7 @@ import org.apache.http.annotation.Immuta
 @Immutable
 public class AllowAllHostnameVerifier extends AbstractVerifier {
 
+    @Override
     public final void verify(
             final String host,
             final String[] cns,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java Fri Jan 24 17:02:05 2014
@@ -47,6 +47,7 @@ import org.apache.http.annotation.Immuta
 @Immutable
 public class BrowserCompatHostnameVerifier extends AbstractVerifier {
 
+    @Override
     public final void verify(
             final String host,
             final String[] cns,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java Fri Jan 24 17:02:05 2014
@@ -218,10 +218,12 @@ public class SSLConnectionSocketFactory 
     protected void prepareSocket(final SSLSocket socket) throws IOException {
     }
 
+    @Override
     public Socket createSocket(final HttpContext context) throws IOException {
         return SocketFactory.getDefault().createSocket();
     }
 
+    @Override
     public Socket connectSocket(
             final int connectTimeout,
             final Socket socket,
@@ -255,6 +257,7 @@ public class SSLConnectionSocketFactory 
         }
     }
 
+    @Override
     public Socket createLayeredSocket(
             final Socket socket,
             final String target,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java Fri Jan 24 17:02:05 2014
@@ -179,11 +179,13 @@ public class SSLContextBuilder {
             this.trustStrategy = trustStrategy;
         }
 
+        @Override
         public void checkClientTrusted(
                 final X509Certificate[] chain, final String authType) throws CertificateException {
             this.trustManager.checkClientTrusted(chain, authType);
         }
 
+        @Override
         public void checkServerTrusted(
                 final X509Certificate[] chain, final String authType) throws CertificateException {
             if (!this.trustStrategy.isTrusted(chain, authType)) {
@@ -191,6 +193,7 @@ public class SSLContextBuilder {
             }
         }
 
+        @Override
         public X509Certificate[] getAcceptedIssuers() {
             return this.trustManager.getAcceptedIssuers();
         }
@@ -208,11 +211,13 @@ public class SSLContextBuilder {
             this.aliasStrategy = aliasStrategy;
         }
 
+        @Override
         public String[] getClientAliases(
                 final String keyType, final Principal[] issuers) {
             return this.keyManager.getClientAliases(keyType, issuers);
         }
 
+        @Override
         public String chooseClientAlias(
                 final String[] keyTypes, final Principal[] issuers, final Socket socket) {
             final Map<String, PrivateKeyDetails> validAliases = new HashMap<String, PrivateKeyDetails>();
@@ -228,11 +233,13 @@ public class SSLContextBuilder {
             return this.aliasStrategy.chooseAlias(validAliases, socket);
         }
 
+        @Override
         public String[] getServerAliases(
                 final String keyType, final Principal[] issuers) {
             return this.keyManager.getServerAliases(keyType, issuers);
         }
 
+        @Override
         public String chooseServerAlias(
                 final String keyType, final Principal[] issuers, final Socket socket) {
             final Map<String, PrivateKeyDetails> validAliases = new HashMap<String, PrivateKeyDetails>();
@@ -246,10 +253,12 @@ public class SSLContextBuilder {
             return this.aliasStrategy.chooseAlias(validAliases, socket);
         }
 
+        @Override
         public X509Certificate[] getCertificateChain(final String alias) {
             return this.keyManager.getCertificateChain(alias);
         }
 
+        @Override
         public PrivateKey getPrivateKey(final String alias) {
             return this.keyManager.getPrivateKey(alias);
         }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java Fri Jan 24 17:02:05 2014
@@ -54,6 +54,7 @@ import org.apache.http.annotation.Immuta
 @Immutable
 public class StrictHostnameVerifier extends AbstractVerifier {
 
+    @Override
     public final void verify(
             final String host,
             final String[] cns,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java Fri Jan 24 17:02:05 2014
@@ -37,6 +37,7 @@ import java.security.cert.X509Certificat
  */
 public class TrustSelfSignedStrategy implements TrustStrategy {
 
+    @Override
     public boolean isTrusted(
             final X509Certificate[] chain, final String authType) throws CertificateException {
         return chain.length == 1;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java Fri Jan 24 17:02:05 2014
@@ -45,6 +45,7 @@ public class CookieIdentityComparator im
 
     private static final long serialVersionUID = 4466565437490631532L;
 
+    @Override
     public int compare(final Cookie c1, final Cookie c2) {
         int res = c1.getName().compareTo(c2.getName());
         if (res == 0) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java Fri Jan 24 17:02:05 2014
@@ -63,6 +63,7 @@ public class CookiePathComparator implem
         return path;
     }
 
+    @Override
     public int compare(final Cookie c1, final Cookie c2) {
         final String path1 = normalizePath(c1);
         final String path2 = normalizePath(c2);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java Fri Jan 24 17:02:05 2014
@@ -152,9 +152,11 @@ public final class CookieSpecRegistry im
         registeredSpecs.putAll(map);
     }
 
+    @Override
     public CookieSpecProvider lookup(final String name) {
         return new CookieSpecProvider() {
 
+            @Override
             public CookieSpec create(final HttpContext context) {
                 final HttpRequest request = (HttpRequest) context.getAttribute(
                         ExecutionContext.HTTP_REQUEST);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java Fri Jan 24 17:02:05 2014
@@ -86,6 +86,7 @@ public abstract class AuthSchemeBase imp
      * @throws MalformedChallengeException is thrown if the authentication challenge
      * is malformed
      */
+    @Override
     public void processChallenge(final Header header) throws MalformedChallengeException {
         Args.notNull(header, "Header");
         final String authheader = header.getName();
@@ -128,6 +129,7 @@ public abstract class AuthSchemeBase imp
     }
 
 
+    @Override
     @SuppressWarnings("deprecation")
     public Header authenticate(
             final Credentials credentials,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java Fri Jan 24 17:02:05 2014
@@ -89,6 +89,7 @@ public class BasicScheme extends RFC2617
      *
      * @return <code>basic</code>
      */
+    @Override
     public String getSchemeName() {
         return "basic";
     }
@@ -114,6 +115,7 @@ public class BasicScheme extends RFC2617
      * @return <tt>true</tt> if Basic authorization has been processed,
      *   <tt>false</tt> otherwise.
      */
+    @Override
     public boolean isComplete() {
         return this.complete;
     }
@@ -123,6 +125,7 @@ public class BasicScheme extends RFC2617
      *
      * @return <tt>false</tt>.
      */
+    @Override
     public boolean isConnectionBased() {
         return false;
     }
@@ -131,6 +134,7 @@ public class BasicScheme extends RFC2617
      * @deprecated (4.2) Use {@link org.apache.http.auth.ContextAwareAuthScheme#authenticate(
      *   Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
      */
+    @Override
     @Deprecated
     public Header authenticate(
             final Credentials credentials, final HttpRequest request) throws AuthenticationException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java Fri Jan 24 17:02:05 2014
@@ -60,10 +60,12 @@ public class BasicSchemeFactory implemen
         this(null);
     }
 
+    @Override
     public AuthScheme newInstance(final HttpParams params) {
         return new BasicScheme();
     }
 
+    @Override
     public AuthScheme create(final HttpContext context) {
         return new BasicScheme(this.charset);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java Fri Jan 24 17:02:05 2014
@@ -145,6 +145,7 @@ public class DigestScheme extends RFC261
      * @return <tt>true</tt> if Digest authorization has been processed,
      *   <tt>false</tt> otherwise.
      */
+    @Override
     public boolean isComplete() {
         final String s = getParameter("stale");
         if ("true".equalsIgnoreCase(s)) {
@@ -159,6 +160,7 @@ public class DigestScheme extends RFC261
      *
      * @return <code>digest</code>
      */
+    @Override
     public String getSchemeName() {
         return "digest";
     }
@@ -168,6 +170,7 @@ public class DigestScheme extends RFC261
      *
      * @return <tt>false</tt>.
      */
+    @Override
     public boolean isConnectionBased() {
         return false;
     }
@@ -180,6 +183,7 @@ public class DigestScheme extends RFC261
      * @deprecated (4.2) Use {@link org.apache.http.auth.ContextAwareAuthScheme#authenticate(
      *   Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
      */
+    @Override
     @Deprecated
     public Header authenticate(
             final Credentials credentials, final HttpRequest request) throws AuthenticationException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java Fri Jan 24 17:02:05 2014
@@ -60,10 +60,12 @@ public class DigestSchemeFactory impleme
         this(null);
     }
 
+    @Override
     public AuthScheme newInstance(final HttpParams params) {
         return new DigestScheme();
     }
 
+    @Override
     public AuthScheme create(final HttpContext context) {
         return new DigestScheme(this.charset);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Fri Jan 24 17:02:05 2014
@@ -107,6 +107,7 @@ public abstract class GGSSchemeBase exte
     protected abstract byte[] generateToken(
             byte[] input, final String authServer) throws GSSException;
 
+    @Override
     public boolean isComplete() {
         return this.state == State.TOKEN_GENERATED || this.state == State.FAILED;
     }
@@ -115,6 +116,7 @@ public abstract class GGSSchemeBase exte
      * @deprecated (4.2) Use {@link org.apache.http.auth.ContextAwareAuthScheme#authenticate(
      *   Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
      */
+    @Override
     @Deprecated
     public Header authenticate(
             final Credentials credentials,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java Fri Jan 24 17:02:05 2014
@@ -54,6 +54,7 @@ public class KerberosScheme extends GGSS
         super(false);
     }
 
+    @Override
     public String getSchemeName() {
         return "Kerberos";
     }
@@ -89,6 +90,7 @@ public class KerberosScheme extends GGSS
      *
      * @return <code>null</code>
      */
+    @Override
     public String getParameter(final String name) {
         Args.notNull(name, "Parameter name");
         return null;
@@ -100,6 +102,7 @@ public class KerberosScheme extends GGSS
      *
      * @return <code>null</code>
      */
+    @Override
     public String getRealm() {
         return null;
     }
@@ -109,6 +112,7 @@ public class KerberosScheme extends GGSS
      *
      * @return <tt>true</tt>.
      */
+    @Override
     public boolean isConnectionBased() {
         return true;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java Fri Jan 24 17:02:05 2014
@@ -58,10 +58,12 @@ public class KerberosSchemeFactory imple
         return stripPort;
     }
 
+    @Override
     public AuthScheme newInstance(final HttpParams params) {
         return new KerberosScheme(this.stripPort);
     }
 
+    @Override
     public AuthScheme create(final HttpContext context) {
         return new KerberosScheme(this.stripPort);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Fri Jan 24 17:02:05 2014
@@ -1649,12 +1649,14 @@ final class NTLMEngineImpl implements NT
 
     }
 
+    @Override
     public String generateType1Msg(
             final String domain,
             final String workstation) throws NTLMEngineException {
         return getType1Message(workstation, domain);
     }
 
+    @Override
     public String generateType3Msg(
             final String username,
             final String password,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java Fri Jan 24 17:02:05 2014
@@ -77,20 +77,24 @@ public class NTLMScheme extends AuthSche
         this(new NTLMEngineImpl());
     }
 
+    @Override
     public String getSchemeName() {
         return "ntlm";
     }
 
+    @Override
     public String getParameter(final String name) {
         // String parameters not supported
         return null;
     }
 
+    @Override
     public String getRealm() {
         // NTLM does not support the concept of an authentication realm
         return null;
     }
 
+    @Override
     public boolean isConnectionBased() {
         return true;
     }
@@ -116,6 +120,7 @@ public class NTLMScheme extends AuthSche
         }
     }
 
+    @Override
     public Header authenticate(
             final Credentials credentials,
             final HttpRequest request) throws AuthenticationException {
@@ -157,6 +162,7 @@ public class NTLMScheme extends AuthSche
         return new BufferedHeader(buffer);
     }
 
+    @Override
     public boolean isComplete() {
         return this.state == State.MSG_TYPE3_GENERATED || this.state == State.FAILED;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java Fri Jan 24 17:02:05 2014
@@ -45,10 +45,12 @@ import org.apache.http.protocol.HttpCont
 @SuppressWarnings("deprecation")
 public class NTLMSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
 
+    @Override
     public AuthScheme newInstance(final HttpParams params) {
         return new NTLMScheme();
     }
 
+    @Override
     public AuthScheme create(final HttpContext context) {
         return new NTLMScheme();
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java Fri Jan 24 17:02:05 2014
@@ -132,6 +132,7 @@ public abstract class RFC2617Scheme exte
      *
      * @return the parameter with the given name
      */
+    @Override
     public String getParameter(final String name) {
         if (name == null) {
             return null;
@@ -144,6 +145,7 @@ public abstract class RFC2617Scheme exte
      *
      * @return the authentication realm
      */
+    @Override
     public String getRealm() {
         return getParameter("realm");
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java Fri Jan 24 17:02:05 2014
@@ -55,6 +55,7 @@ public class SPNegoScheme extends GGSSch
         super(false);
     }
 
+    @Override
     public String getSchemeName() {
         return "Negotiate";
     }
@@ -90,6 +91,7 @@ public class SPNegoScheme extends GGSSch
      *
      * @return <code>null</code>
      */
+    @Override
     public String getParameter(final String name) {
         Args.notNull(name, "Parameter name");
         return null;
@@ -101,6 +103,7 @@ public class SPNegoScheme extends GGSSch
      *
      * @return <code>null</code>
      */
+    @Override
     public String getRealm() {
         return null;
     }
@@ -110,6 +113,7 @@ public class SPNegoScheme extends GGSSch
      *
      * @return <tt>true</tt>.
      */
+    @Override
     public boolean isConnectionBased() {
         return true;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java Fri Jan 24 17:02:05 2014
@@ -58,10 +58,12 @@ public class SPNegoSchemeFactory impleme
         return stripPort;
     }
 
+    @Override
     public AuthScheme newInstance(final HttpParams params) {
         return new SPNegoScheme(this.stripPort);
     }
 
+    @Override
     public AuthScheme create(final HttpContext context) {
         return new SPNegoScheme(this.stripPort);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java Fri Jan 24 17:02:05 2014
@@ -82,6 +82,7 @@ public class AIMDBackoffManager implemen
         this.lastRouteBackoffs = new HashMap<HttpRoute,Long>();
     }
 
+    @Override
     public void backOff(final HttpRoute route) {
         synchronized(connPerRoute) {
             final int curr = connPerRoute.getMaxPerRoute(route);
@@ -102,6 +103,7 @@ public class AIMDBackoffManager implemen
         return (int)(Math.floor(backoffFactor * curr));
     }
 
+    @Override
     public void probe(final HttpRoute route) {
         synchronized(connPerRoute) {
             final int curr = connPerRoute.getMaxPerRoute(route);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java Fri Jan 24 17:02:05 2014
@@ -83,6 +83,7 @@ abstract class AuthenticationStrategyImp
         this.headerName = headerName;
     }
 
+    @Override
     public boolean isAuthenticationRequested(
             final HttpHost authhost,
             final HttpResponse response,
@@ -92,6 +93,7 @@ abstract class AuthenticationStrategyImp
         return status == this.challengeCode;
     }
 
+    @Override
     public Map<String, Header> getChallenges(
             final HttpHost authhost,
             final HttpResponse response,
@@ -130,6 +132,7 @@ abstract class AuthenticationStrategyImp
 
     abstract Collection<String> getPreferredAuthSchemes(RequestConfig config);
 
+    @Override
     public Queue<AuthOption> select(
             final Map<String, Header> challenges,
             final HttpHost authhost,
@@ -195,6 +198,7 @@ abstract class AuthenticationStrategyImp
         return options;
     }
 
+    @Override
     public void authSucceeded(
             final HttpHost authhost, final AuthScheme authScheme, final HttpContext context) {
         Args.notNull(authhost, "Host");
@@ -226,6 +230,7 @@ abstract class AuthenticationStrategyImp
                 schemeName.equalsIgnoreCase(AuthSchemes.DIGEST);
     }
 
+    @Override
     public void authFailed(
             final HttpHost authhost, final AuthScheme authScheme, final HttpContext context) {
         Args.notNull(authhost, "Host");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java Fri Jan 24 17:02:05 2014
@@ -78,21 +78,25 @@ public class BasicAuthCache implements A
         }
     }
 
+    @Override
     public void put(final HttpHost host, final AuthScheme authScheme) {
         Args.notNull(host, "HTTP host");
         this.map.put(getKey(host), authScheme);
     }
 
+    @Override
     public AuthScheme get(final HttpHost host) {
         Args.notNull(host, "HTTP host");
         return this.map.get(getKey(host));
     }
 
+    @Override
     public void remove(final HttpHost host) {
         Args.notNull(host, "HTTP host");
         this.map.remove(getKey(host));
     }
 
+    @Override
     public void clear() {
         this.map.clear();
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java Fri Jan 24 17:02:05 2014
@@ -68,6 +68,7 @@ public class BasicCookieStore implements
      * @see #addCookies(Cookie[])
      *
      */
+    @Override
     public synchronized void addCookie(final Cookie cookie) {
         if (cookie != null) {
             // first remove any old cookie that is equivalent
@@ -102,6 +103,7 @@ public class BasicCookieStore implements
      *
      * @return an array of {@link Cookie cookies}.
      */
+    @Override
     public synchronized List<Cookie> getCookies() {
         //create defensive copy so it won't be concurrently modified
         return new ArrayList<Cookie>(cookies);
@@ -115,6 +117,7 @@ public class BasicCookieStore implements
      *
      * @see Cookie#isExpired(Date)
      */
+    @Override
     public synchronized boolean clearExpired(final Date date) {
         if (date == null) {
             return false;
@@ -132,6 +135,7 @@ public class BasicCookieStore implements
     /**
      * Clears all cookies.
      */
+    @Override
     public synchronized void clear() {
         cookies.clear();
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java Fri Jan 24 17:02:05 2014
@@ -53,6 +53,7 @@ public class BasicCredentialsProvider im
         this.credMap = new ConcurrentHashMap<AuthScope, Credentials>();
     }
 
+    @Override
     public void setCredentials(
             final AuthScope authscope,
             final Credentials credentials) {
@@ -92,11 +93,13 @@ public class BasicCredentialsProvider im
         return creds;
     }
 
+    @Override
     public Credentials getCredentials(final AuthScope authscope) {
         Args.notNull(authscope, "Authentication scope");
         return matchCredentials(this.credMap, authscope);
     }
 
+    @Override
     public void clear() {
         this.credMap.clear();
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java Fri Jan 24 17:02:05 2014
@@ -58,6 +58,7 @@ public class BasicResponseHandler implem
      * response was unsuccessful (>= 300 status code), throws an
      * {@link HttpResponseException}.
      */
+    @Override
     public String handleResponse(final HttpResponse response)
             throws HttpResponseException, IOException {
         final StatusLine statusLine = response.getStatusLine();



Mime
View raw message