hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1561063 [4/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/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java Fri Jan 24 17:02:05 2014
@@ -99,6 +99,7 @@ class ResponseEntityWrapper extends Http
         }
     }
 
+    @Override
     public boolean eofDetected(final InputStream wrapped) throws IOException {
         try {
             // there may be some cleanup required, such as
@@ -111,6 +112,7 @@ class ResponseEntityWrapper extends Http
         return false;
     }
 
+    @Override
     public boolean streamClosed(final InputStream wrapped) throws IOException {
         try {
             final boolean open = connReleaseTrigger != null && !connReleaseTrigger.isReleased();
@@ -130,6 +132,7 @@ class ResponseEntityWrapper extends Http
         return false;
     }
 
+    @Override
     public boolean streamAbort(final InputStream wrapped) throws IOException {
         cleanup();
         return false;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseProxyHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseProxyHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseProxyHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseProxyHandler.java Fri Jan 24 17:02:05 2014
@@ -77,6 +77,7 @@ class ResponseProxyHandler implements In
         }
     }
 
+    @Override
     public Object invoke(
             final Object proxy, final Method method, final Object[] args) throws Throwable {
         if (method.equals(CLOSE_METHOD)) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java Fri Jan 24 17:02:05 2014
@@ -72,6 +72,7 @@ public class RetryExec implements Client
         this.retryHandler = retryHandler;
     }
 
+    @Override
     public CloseableHttpResponse execute(
             final HttpRoute route,
             final HttpRequestWrapper request,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.java Fri Jan 24 17:02:05 2014
@@ -71,6 +71,7 @@ public class ServiceUnavailableRetryExec
         this.retryStrategy = retryStrategy;
     }
 
+    @Override
     public CloseableHttpResponse execute(
             final HttpRoute route,
             final HttpRequestWrapper request,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Fri Jan 24 17:02:05 2014
@@ -85,17 +85,21 @@ public class TestSSLSocketFactory extend
 
         private boolean fired = false;
 
+        @Override
         public boolean verify(final String host, final SSLSession session) {
             return true;
         }
 
+        @Override
         public void verify(final String host, final SSLSocket ssl) throws IOException {
             this.fired = true;
         }
 
+        @Override
         public void verify(final String host, final String[] cns, final String[] subjectAlts) throws SSLException {
         }
 
+        @Override
         public void verify(final String host, final X509Certificate cert) throws SSLException {
         }
 
@@ -198,6 +202,7 @@ public class TestSSLSocketFactory extend
     public void testClientAuthSSLAliasChoice() throws Exception {
         final PrivateKeyStrategy aliasStrategy = new PrivateKeyStrategy() {
 
+            @Override
             public String chooseAlias(
                     final Map<String, PrivateKeyDetails> aliases, final Socket socket) {
                 Assert.assertEquals(2, aliases.size());
@@ -278,6 +283,7 @@ public class TestSSLSocketFactory extend
 
         final TrustStrategy trustStrategy = new TrustStrategy() {
 
+            @Override
             public boolean isTrusted(
                     final X509Certificate[] chain, final String authType) throws CertificateException {
                 return chain.length == 1;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java Fri Jan 24 17:02:05 2014
@@ -43,6 +43,7 @@ public class TestRFC2617Scheme {
 
     static class TestAuthScheme extends RFC2617Scheme {
 
+        @Override
         @Deprecated
         public Header authenticate(
                 final Credentials credentials,
@@ -50,14 +51,17 @@ public class TestRFC2617Scheme {
             return null;
         }
 
+        @Override
         public String getSchemeName() {
             return "test";
         }
 
+        @Override
         public boolean isComplete() {
             return false;
         }
 
+        @Override
         public boolean isConnectionBased() {
             return false;
         }

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java Fri Jan 24 17:02:05 2014
@@ -30,6 +30,7 @@ public class MockClock implements Clock 
 
     private long t = System.currentTimeMillis();
 
+    @Override
     public long getCurrentTime() {
         return t;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java Fri Jan 24 17:02:05 2014
@@ -47,34 +47,42 @@ public final class MockConnPoolControl i
         this.defaultMax = 2;
     }
 
+    @Override
     public void setMaxTotal(final int max) {
         this.totalMax = max;
     }
 
+    @Override
     public int getMaxTotal() {
         return this.totalMax;
     }
 
+    @Override
     public PoolStats getTotalStats() {
         return new PoolStats(-1, -1, -1, this.totalMax);
     }
 
+    @Override
     public PoolStats getStats(final HttpRoute route) {
         return new PoolStats(-1, -1, -1, getMaxPerRoute(route));
     }
 
+    @Override
     public int getDefaultMaxPerRoute() {
         return this.defaultMax;
     }
 
+    @Override
     public void setDefaultMaxPerRoute(final int max) {
         this.defaultMax = max;
     }
 
+    @Override
     public void setMaxPerRoute(final HttpRoute route, final int max) {
         this.maxPerHostMap.put(route, Integer.valueOf(max));
     }
 
+    @Override
     public int getMaxPerRoute(final HttpRoute route) {
         final Integer max = this.maxPerHostMap.get(route);
         if (max != null) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestFutureRequestExecutionService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestFutureRequestExecutionService.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestFutureRequestExecutionService.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestFutureRequestExecutionService.java Fri Jan 24 17:02:05 2014
@@ -71,6 +71,7 @@ public class TestFutureRequestExecutionS
             this.localServer = new LocalTestServer(null, null);
             this.localServer.register("/wait", new HttpRequestHandler() {
 
+                @Override
                 public void handle(
                         final HttpRequest request, final HttpResponse response,
                         final HttpContext context) throws HttpException, IOException {
@@ -168,14 +169,17 @@ public class TestFutureRequestExecutionS
             this.latch = latch;
         }
 
+        @Override
         public void failed(final Exception ex) {
             latch.countDown();
         }
 
+        @Override
         public void completed(final Boolean result) {
             latch.countDown();
         }
 
+        @Override
         public void cancelled() {
             latch.countDown();
         }
@@ -183,6 +187,7 @@ public class TestFutureRequestExecutionS
 
 
     private final class OkidokiHandler implements ResponseHandler<Boolean> {
+        @Override
         public Boolean handleResponse(
                 final HttpResponse response) throws ClientProtocolException, IOException {
             return response.getStatusLine().getStatusCode() == 200;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java Fri Jan 24 17:02:05 2014
@@ -77,6 +77,7 @@ public class TestAbortHandling extends I
         final CountDownLatch wait = new CountDownLatch(1);
 
         this.localServer.register("*", new HttpRequestHandler(){
+            @Override
             public void handle(final HttpRequest request, final HttpResponse response,
                     final HttpContext context) throws HttpException, IOException {
                 try {
@@ -132,6 +133,7 @@ public class TestAbortHandling extends I
         this.httpclient = client;
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     client.execute(httpget, context);
@@ -172,6 +174,7 @@ public class TestAbortHandling extends I
         this.httpclient = client;
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     client.execute(getServerHttp(), httpget, context);
@@ -212,6 +215,7 @@ public class TestAbortHandling extends I
         this.httpclient = client;
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     try {
@@ -259,6 +263,7 @@ public class TestAbortHandling extends I
         this.httpclient = client;
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     final HttpHost host = new HttpHost("127.0.0.1", port);
@@ -316,6 +321,7 @@ public class TestAbortHandling extends I
     }
 
     private static class BasicService implements HttpRequestHandler {
+        @Override
         public void handle(final HttpRequest request,
                 final HttpResponse response,
                 final HttpContext context) throws HttpException, IOException {
@@ -332,6 +338,7 @@ public class TestAbortHandling extends I
             this.port = port;
         }
 
+        @Override
         public void handle(final HttpRequest request,
                 final HttpResponse response, final HttpContext context)
                 throws HttpException, IOException {
@@ -362,11 +369,13 @@ public class TestAbortHandling extends I
 
                 return new ConnectionRequest() {
 
+                    @Override
                     public boolean cancel() {
                         currentThread.interrupt();
                         return true;
                     }
 
+                    @Override
                     public HttpClientConnection get(
                             final long timeout,
                             final TimeUnit tunit) throws InterruptedException, ConnectionPoolTimeoutException {
@@ -396,10 +405,12 @@ public class TestAbortHandling extends I
             this.awaitLatch = awaitLatch;
         }
 
+        @Override
         public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
             throw new UnsupportedOperationException("just a mockup");
         }
 
+        @Override
         public void closeExpiredConnections() {
             throw new UnsupportedOperationException("just a mockup");
         }
@@ -409,6 +420,7 @@ public class TestAbortHandling extends I
             throw new UnsupportedOperationException("just a mockup");
         }
 
+        @Override
         public ConnectionRequest requestConnection(
                 final HttpRoute route,
                 final Object state) {
@@ -417,11 +429,13 @@ public class TestAbortHandling extends I
 
             return new ConnectionRequest() {
 
+                @Override
                 public boolean cancel() {
                     currentThread.interrupt();
                     return true;
                 }
 
+                @Override
                 public HttpClientConnection get(
                         final long timeout,
                         final TimeUnit tunit) throws InterruptedException, ConnectionPoolTimeoutException {
@@ -438,12 +452,14 @@ public class TestAbortHandling extends I
             };
         }
 
+        @Override
         public void shutdown() {
         }
 
         public void close() {
         }
 
+        @Override
         public void releaseConnection(
                 final HttpClientConnection conn,
                 final Object newState,
@@ -451,6 +467,7 @@ public class TestAbortHandling extends I
             throw new UnsupportedOperationException("just a mockup");
         }
 
+        @Override
         public void connect(
                 final HttpClientConnection conn,
                 final HttpRoute route,
@@ -459,6 +476,7 @@ public class TestAbortHandling extends I
             throw new UnsupportedOperationException("just a mockup");
         }
 
+        @Override
         public void upgrade(
                 final HttpClientConnection conn,
                 final HttpRoute route,
@@ -466,6 +484,7 @@ public class TestAbortHandling extends I
             throw new UnsupportedOperationException("just a mockup");
         }
 
+        @Override
         public void routeComplete(
                 final HttpClientConnection conn,
                 final HttpRoute route,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java Fri Jan 24 17:02:05 2014
@@ -98,6 +98,7 @@ public class TestClientAuthentication ex
 
     static class AuthHandler implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -123,6 +124,7 @@ public class TestClientAuthentication ex
             this.authTokenExtractor = new BasicAuthTokenExtractor();
         }
 
+        @Override
         public void verify(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -147,14 +149,17 @@ public class TestClientAuthentication ex
             this.creds = creds;
         }
 
+        @Override
         public void clear() {
         }
 
+        @Override
         public Credentials getCredentials(final AuthScope authscope) {
             this.authscope = authscope;
             return this.creds;
         }
 
+        @Override
         public void setCredentials(final AuthScope authscope, final Credentials credentials) {
         }
 
@@ -431,6 +436,7 @@ public class TestClientAuthentication ex
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -471,6 +477,7 @@ public class TestClientAuthentication ex
             this.count = new AtomicLong();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -556,6 +563,7 @@ public class TestClientAuthentication ex
 
     static class ProxyAuthHandler implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -590,6 +598,7 @@ public class TestClientAuthentication ex
 
     static class ClosingAuthHandler implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFakeNTLM.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFakeNTLM.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFakeNTLM.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFakeNTLM.java Fri Jan 24 17:02:05 2014
@@ -62,6 +62,7 @@ public class TestClientAuthenticationFak
 
     static class NtlmResponseHandler implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -107,6 +108,7 @@ public class TestClientAuthenticationFak
             this.authenticateHeaderValue = "NTLM " + type2Message;
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -184,6 +186,7 @@ public class TestClientAuthenticationFak
             this.authenticateHeaderValue = "NTLM " + type2Message;
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java Fri Jan 24 17:02:05 2014
@@ -62,6 +62,7 @@ public class TestClientAuthenticationFal
 
     public class ResponseBasicUnauthorized implements HttpResponseInterceptor {
 
+        @Override
         public void process(
                 final HttpResponse response,
                 final HttpContext context) throws HttpException, IOException {
@@ -88,6 +89,7 @@ public class TestClientAuthenticationFal
 
     static class AuthHandler implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -114,14 +116,17 @@ public class TestClientAuthenticationFal
             this.creds = creds;
         }
 
+        @Override
         public void clear() {
         }
 
+        @Override
         public Credentials getCredentials(final AuthScope authscope) {
             this.authscope = authscope;
             return this.creds;
         }
 
+        @Override
         public void setCredentials(final AuthScope authscope, final Credentials credentials) {
         }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java Fri Jan 24 17:02:05 2014
@@ -73,6 +73,7 @@ public class TestClientReauthentication 
 
     public class ResponseBasicUnauthorized implements HttpResponseInterceptor {
 
+        @Override
         public void process(
                 final HttpResponse response,
                 final HttpContext context) throws HttpException, IOException {
@@ -101,6 +102,7 @@ public class TestClientReauthentication 
 
         private final AtomicLong count = new AtomicLong(0);
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -132,14 +134,17 @@ public class TestClientReauthentication 
             this.creds = creds;
         }
 
+        @Override
         public void clear() {
         }
 
+        @Override
         public Credentials getCredentials(final AuthScope authscope) {
             this.authscope = authscope;
             return this.creds;
         }
 
+        @Override
         public void setCredentials(final AuthScope authscope, final Credentials credentials) {
         }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java Fri Jan 24 17:02:05 2014
@@ -75,6 +75,7 @@ public class TestClientRequestExecution 
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -119,6 +120,7 @@ public class TestClientRequestExecution 
 
         final HttpRequestInterceptor interceptor = new HttpRequestInterceptor() {
 
+            @Override
             public void process(
                     final HttpRequest request,
                     final HttpContext context) throws HttpException, IOException {
@@ -129,6 +131,7 @@ public class TestClientRequestExecution 
 
         final HttpRequestRetryHandler requestRetryHandler = new HttpRequestRetryHandler() {
 
+            @Override
             public boolean retryRequest(
                     final IOException exception,
                     final int executionCount,
@@ -168,6 +171,7 @@ public class TestClientRequestExecution 
 
         final HttpRequestRetryHandler requestRetryHandler = new HttpRequestRetryHandler() {
 
+            @Override
             public boolean retryRequest(
                     final IOException exception,
                     final int executionCount,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionAutoRelease.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionAutoRelease.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionAutoRelease.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionAutoRelease.java Fri Jan 24 17:02:05 2014
@@ -182,6 +182,7 @@ public class TestConnectionAutoRelease e
     public void testReleaseOnIOException() throws Exception {
         this.localServer.register("/dropdead", new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java Fri Jan 24 17:02:05 2014
@@ -452,6 +452,7 @@ public class TestConnectionManagement ex
 
         final AtomicReference<Throwable> throwRef = new AtomicReference<Throwable>();
         final Thread abortingThread = new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     stallingSocketFactory.waitForState();
@@ -507,6 +508,7 @@ public class TestConnectionManagement ex
 
         final AtomicReference<Throwable> throwRef = new AtomicReference<Throwable>();
         final Thread abortingThread = new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     stallingSocketFactory.waitForState();
@@ -563,6 +565,7 @@ public class TestConnectionManagement ex
 
         final AtomicReference<Throwable> throwRef = new AtomicReference<Throwable>();
         final Thread abortingThread = new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     stallingSocketFactory.waitForState();
@@ -648,6 +651,7 @@ public class TestConnectionManagement ex
             this.delegate = delegate;
         }
 
+        @Override
         public Socket connectSocket(
                 final int connectTimeout,
                 final Socket sock,
@@ -669,6 +673,7 @@ public class TestConnectionManagement ex
             return socket;
         }
 
+        @Override
         public Socket createSocket(final HttpContext context) throws IOException {
             if(waitPolicy == WaitPolicy.BEFORE_CREATE) {
                 latch();

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java Fri Jan 24 17:02:05 2014
@@ -115,6 +115,7 @@ public class TestConnectionReuse {
 
     private static class AlwaysCloseConn implements HttpResponseInterceptor {
 
+        @Override
         public void process(
                 final HttpResponse response,
                 final HttpContext context) throws HttpException, IOException {
@@ -327,6 +328,7 @@ public class TestConnectionReuse {
     // A very basic keep-alive header interceptor, to add Keep-Alive: timeout=1
     // if there is no Connection: close header.
     private static class ResponseKeepAlive implements HttpResponseInterceptor {
+        @Override
         public void process(final HttpResponse response, final HttpContext context)
                 throws HttpException, IOException {
             final Header connection = response.getFirstHeader(HTTP.CONN_DIRECTIVE);

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java Fri Jan 24 17:02:05 2014
@@ -85,6 +85,7 @@ public class TestContentCodings extends 
             /**
              * {@inheritDoc}
              */
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -291,6 +292,7 @@ public class TestContentCodings extends 
             /**
              * {@inheritDoc}
              */
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -340,6 +342,7 @@ public class TestContentCodings extends 
             /**
              * {@inheritDoc}
              */
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,
@@ -448,6 +451,7 @@ public class TestContentCodings extends 
         /**
          * {@inheritDoc}
          */
+        @Override
         public void run() {
             try {
                 startGate.await();

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java Fri Jan 24 17:02:05 2014
@@ -66,6 +66,7 @@ public class TestCookie2Support extends 
 
     private static class CookieVer0Service implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -110,6 +111,7 @@ public class TestCookie2Support extends 
 
     private static class CookieVer1Service implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -155,6 +157,7 @@ public class TestCookie2Support extends 
 
     private static class CookieVer2Service implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -199,6 +202,7 @@ public class TestCookie2Support extends 
 
     private static class SetCookieVersionMixService implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookieVirtualHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookieVirtualHost.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookieVirtualHost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookieVirtualHost.java Fri Jan 24 17:02:05 2014
@@ -66,6 +66,7 @@ public class TestCookieVirtualHost exten
     @Test
     public void testCookieMatchingWithVirtualHosts() throws Exception {
         this.localServer.register("*", new HttpRequestHandler() {
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java Fri Jan 24 17:02:05 2014
@@ -63,6 +63,7 @@ public class TestMinimalClientRequestExe
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java Fri Jan 24 17:02:05 2014
@@ -87,6 +87,7 @@ public class TestRedirects extends Integ
             this(-1);
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -117,6 +118,7 @@ public class TestRedirects extends Integ
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -140,6 +142,7 @@ public class TestRedirects extends Integ
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -164,6 +167,7 @@ public class TestRedirects extends Integ
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -188,6 +192,7 @@ public class TestRedirects extends Integ
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -212,6 +217,7 @@ public class TestRedirects extends Integ
             this.url = redirectUrl;
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -306,6 +312,7 @@ public class TestRedirects extends Integ
         final HttpHost target = getServerHttp();
         this.localServer.register("*", new HttpRequestHandler() {
 
+            @Override
             public void handle(
                     final HttpRequest request,
                     final HttpResponse response,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java Fri Jan 24 17:02:05 2014
@@ -77,6 +77,7 @@ public class TestSPNegoScheme extends In
      */
     private static class PleaseNegotiateService implements HttpRequestHandler {
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -122,10 +123,12 @@ public class TestSPNegoScheme extends In
 
     private static class UseJaasCredentials implements Credentials {
 
+        @Override
         public String getPassword() {
             return null;
         }
 
+        @Override
         public Principal getUserPrincipal() {
             return null;
         }
@@ -140,6 +143,7 @@ public class TestSPNegoScheme extends In
             scheme = new NegotiateSchemeWithMockGssManager();
         }
 
+        @Override
         public AuthScheme create(final HttpContext context) {
             return scheme;
         }

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java Fri Jan 24 17:02:05 2014
@@ -65,6 +65,7 @@ public class TestStatefulConnManagement 
             super();
         }
 
+        @Override
         public void handle(
                 final HttpRequest request,
                 final HttpResponse response,
@@ -92,6 +93,7 @@ public class TestStatefulConnManagement 
 
         final UserTokenHandler userTokenHandler = new UserTokenHandler() {
 
+            @Override
             public Object getUserToken(final HttpContext context) {
                 final String id = (String) context.getAttribute("user");
                 return id;
@@ -222,6 +224,7 @@ public class TestStatefulConnManagement 
 
         final UserTokenHandler userTokenHandler = new UserTokenHandler() {
 
+            @Override
             public Object getUserToken(final HttpContext context) {
                 return context.getAttribute("user");
             }

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java Fri Jan 24 17:02:05 2014
@@ -43,25 +43,31 @@ public class TestAbstractCookieSpec {
 
     private static class DummyCookieSpec extends AbstractCookieSpec {
 
+        @Override
         public List<Header> formatCookies(final List<Cookie> cookies) {
             return null;
         }
 
+        @Override
         public boolean match(final Cookie cookie, final CookieOrigin origin) {
             return true;
         }
 
+        @Override
         public List<Cookie> parse(final Header header, final CookieOrigin origin) throws MalformedCookieException {
             return null;
         }
 
+        @Override
         public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
         }
 
+        @Override
         public int getVersion() {
             return 0;
         }
 
+        @Override
         public Header getVersionHeader() {
             return null;
         }
@@ -70,13 +76,16 @@ public class TestAbstractCookieSpec {
 
     private static class DummyCookieAttribHandler implements CookieAttributeHandler {
 
+        @Override
         public boolean match(final Cookie cookie, final CookieOrigin origin) {
             return true;
         }
 
+        @Override
         public void parse(final SetCookie cookie, final String value) throws MalformedCookieException {
         }
 
+        @Override
         public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
         }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java Fri Jan 24 17:02:05 2014
@@ -550,6 +550,7 @@ public class TestMainClientExec {
                 Mockito.<HttpClientConnection>any(),
                 Mockito.<HttpClientContext>any())).thenAnswer(new Answer<HttpResponse>() {
 
+            @Override
             public HttpResponse answer(final InvocationOnMock invocationOnMock) throws Throwable {
                 final Object[] args = invocationOnMock.getArguments();
                 final HttpEntityEnclosingRequest request = (HttpEntityEnclosingRequest) args[0];

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestRetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestRetryExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestRetryExec.java Fri Jan 24 17:02:05 2014
@@ -86,6 +86,7 @@ public class TestRetryExec {
                 Mockito.<HttpClientContext>any(),
                 Mockito.<HttpExecutionAware>any())).thenAnswer(new Answer<Object>() {
 
+            @Override
             public Object answer(final InvocationOnMock invocationOnMock) throws Throwable {
                 final Object[] args = invocationOnMock.getArguments();
                 final HttpRequestWrapper wrapper = (HttpRequestWrapper) args[1];
@@ -161,6 +162,7 @@ public class TestRetryExec {
                 Mockito.<HttpClientContext>any(),
                 Mockito.<HttpExecutionAware>any())).thenAnswer(new Answer<Object>() {
 
+            @Override
             public Object answer(final InvocationOnMock invocationOnMock) throws Throwable {
                 final Object[] args = invocationOnMock.getArguments();
                 final HttpEntityEnclosingRequest request = (HttpEntityEnclosingRequest) args[1];

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java Fri Jan 24 17:02:05 2014
@@ -67,6 +67,7 @@ public class EchoHandler
      * @throws HttpException    in case of a problem
      * @throws IOException      in case of an IO problem
      */
+    @Override
     public void handle(final HttpRequest request,
                        final HttpResponse response,
                        final HttpContext context)

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java Fri Jan 24 17:02:05 2014
@@ -71,6 +71,7 @@ public class RandomHandler
      * @throws HttpException    in case of a problem
      * @throws IOException      in case of an IO problem
      */
+    @Override
     public void handle(final HttpRequest request,
                        final HttpResponse response,
                        final HttpContext context)
@@ -163,6 +164,7 @@ public class RandomHandler
          *
          * @return      false
          */
+        @Override
         public final boolean isStreaming() {
             return false;
         }
@@ -174,6 +176,7 @@ public class RandomHandler
          *
          * @return      <code>true</code>
          */
+        @Override
         public boolean isRepeatable() {
             return true;
         }
@@ -183,6 +186,7 @@ public class RandomHandler
          *
          * @return      the number of random bytes to generate
          */
+        @Override
         public long getContentLength() {
             return length;
         }
@@ -194,6 +198,7 @@ public class RandomHandler
          *
          * @return      never anything
          */
+        @Override
         public InputStream getContent() {
             throw new UnsupportedOperationException();
         }
@@ -204,6 +209,7 @@ public class RandomHandler
          *
          * @param out   where to write the content to
          */
+        @Override
         public void writeTo(final OutputStream out) throws IOException {
 
             final int blocksize = 2048;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java Fri Jan 24 17:02:05 2014
@@ -43,6 +43,7 @@ public class RequestBasicAuth implements
         this.authTokenExtractor = new BasicAuthTokenExtractor();
     }
 
+    @Override
     public void process(
             final HttpRequest request,
             final HttpContext context) throws HttpException, IOException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java Fri Jan 24 17:02:05 2014
@@ -38,6 +38,7 @@ import org.apache.http.protocol.HttpCont
 
 public class ResponseBasicUnauthorized implements HttpResponseInterceptor {
 
+    @Override
     public void process(
             final HttpResponse response,
             final HttpContext context) throws HttpException, IOException {

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/Header.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/Header.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/Header.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/Header.java Fri Jan 24 17:02:05 2014
@@ -132,6 +132,7 @@ public class Header implements Iterable<
         this.fields.add(firstOccurrence, field);
     }
 
+    @Override
     public Iterator<MinimalField> iterator() {
         return Collections.unmodifiableList(fields).iterator();
     }

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartFormEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartFormEntity.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartFormEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartFormEntity.java Fri Jan 24 17:02:05 2014
@@ -56,30 +56,37 @@ class MultipartFormEntity implements Htt
         return this.multipart;
     }
 
+    @Override
     public boolean isRepeatable() {
         return this.contentLength != -1;
     }
 
+    @Override
     public boolean isChunked() {
         return !isRepeatable();
     }
 
+    @Override
     public boolean isStreaming() {
         return !isRepeatable();
     }
 
+    @Override
     public long getContentLength() {
         return this.contentLength;
     }
 
+    @Override
     public Header getContentType() {
         return this.contentType;
     }
 
+    @Override
     public Header getContentEncoding() {
         return null;
     }
 
+    @Override
     public void consumeContent()
         throws IOException, UnsupportedOperationException{
         if (isStreaming()) {
@@ -88,11 +95,13 @@ class MultipartFormEntity implements Htt
         }
     }
 
+    @Override
     public InputStream getContent() throws IOException {
         throw new UnsupportedOperationException(
                     "Multipart form entity does not implement #getContent()");
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         this.multipart.writeTo(outstream);
     }

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/AbstractContentBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/AbstractContentBody.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/AbstractContentBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/AbstractContentBody.java Fri Jan 24 17:02:05 2014
@@ -64,10 +64,12 @@ public abstract class AbstractContentBod
         return this.contentType;
     }
 
+    @Override
     public String getMimeType() {
         return this.contentType.getMimeType();
     }
 
+    @Override
     public String getMediaType() {
         final String mimeType = this.contentType.getMimeType();
         final int i = mimeType.indexOf('/');
@@ -78,6 +80,7 @@ public abstract class AbstractContentBod
         }
     }
 
+    @Override
     public String getSubType() {
         final String mimeType = this.contentType.getMimeType();
         final int i = mimeType.indexOf('/');
@@ -88,6 +91,7 @@ public abstract class AbstractContentBod
         }
     }
 
+    @Override
     public String getCharset() {
         final Charset charset = this.contentType.getCharset();
         return charset != null ? charset.name() : null;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java Fri Jan 24 17:02:05 2014
@@ -87,10 +87,12 @@ public class ByteArrayBody extends Abstr
         this(data, "application/octet-stream", filename);
     }
 
+    @Override
     public String getFilename() {
         return filename;
     }
 
+    @Override
     public void writeTo(final OutputStream out) throws IOException {
         out.write(data);
     }
@@ -100,10 +102,12 @@ public class ByteArrayBody extends Abstr
         return null;
     }
 
+    @Override
     public String getTransferEncoding() {
         return MIME.ENC_BINARY;
     }
 
+    @Override
     public long getContentLength() {
         return data.length;
     }

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java Fri Jan 24 17:02:05 2014
@@ -110,6 +110,7 @@ public class FileBody extends AbstractCo
         return new FileInputStream(this.file);
     }
 
+    @Override
     public void writeTo(final OutputStream out) throws IOException {
         Args.notNull(out, "Output stream");
         final InputStream in = new FileInputStream(this.file);
@@ -125,14 +126,17 @@ public class FileBody extends AbstractCo
         }
     }
 
+    @Override
     public String getTransferEncoding() {
         return MIME.ENC_BINARY;
     }
 
+    @Override
     public long getContentLength() {
         return this.file.length();
     }
 
+    @Override
     public String getFilename() {
         return filename;
     }

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java Fri Jan 24 17:02:05 2014
@@ -83,6 +83,7 @@ public class InputStreamBody extends Abs
         return this.in;
     }
 
+    @Override
     public void writeTo(final OutputStream out) throws IOException {
         Args.notNull(out, "Output stream");
         try {
@@ -97,14 +98,17 @@ public class InputStreamBody extends Abs
         }
     }
 
+    @Override
     public String getTransferEncoding() {
         return MIME.ENC_BINARY;
     }
 
+    @Override
     public long getContentLength() {
         return -1;
     }
 
+    @Override
     public String getFilename() {
         return this.filename;
     }

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java Fri Jan 24 17:02:05 2014
@@ -170,6 +170,7 @@ public class StringBody extends Abstract
                 charset != null ? charset : Consts.ASCII);
     }
 
+    @Override
     public void writeTo(final OutputStream out) throws IOException {
         Args.notNull(out, "Output stream");
         final InputStream in = new ByteArrayInputStream(this.content);
@@ -181,14 +182,17 @@ public class StringBody extends Abstract
         out.flush();
     }
 
+    @Override
     public String getTransferEncoding() {
         return MIME.ENC_8BIT;
     }
 
+    @Override
     public long getContentLength() {
         return this.content.length;
     }
 
+    @Override
     public String getFilename() {
         return null;
     }



Mime
View raw message