diff --git a/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java b/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java index 0443ce61c..c066eaf68 100644 --- a/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java +++ b/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java @@ -339,38 +339,45 @@ public class CachingHttpClient implements HttpClient { return cacheUpdates.get(); } + @Override public HttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException { final HttpContext defaultContext = null; return execute(target, request, defaultContext); } + @Override public T execute(final HttpHost target, final HttpRequest request, final ResponseHandler responseHandler) throws IOException { return execute(target, request, responseHandler, null); } + @Override public T execute(final HttpHost target, final HttpRequest request, final ResponseHandler responseHandler, final HttpContext context) throws IOException { final HttpResponse resp = execute(target, request, context); return handleAndConsume(responseHandler,resp); } + @Override public HttpResponse execute(final HttpUriRequest request) throws IOException { final HttpContext context = null; return execute(request, context); } + @Override public HttpResponse execute(final HttpUriRequest request, final HttpContext context) throws IOException { final URI uri = request.getURI(); final HttpHost httpHost = new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme()); return execute(httpHost, request, context); } + @Override public T execute(final HttpUriRequest request, final ResponseHandler responseHandler) throws IOException { return execute(request, responseHandler, null); } + @Override public T execute(final HttpUriRequest request, final ResponseHandler responseHandler, final HttpContext context) throws IOException { final HttpResponse resp = execute(request, context); @@ -408,14 +415,17 @@ public class CachingHttpClient implements HttpClient { return result; } + @Override public ClientConnectionManager getConnectionManager() { return backend.getConnectionManager(); } + @Override public HttpParams getParams() { return backend.getParams(); } + @Override public HttpResponse execute(final HttpHost target, final HttpRequest originalRequest, final HttpContext context) throws IOException { @@ -1138,6 +1148,7 @@ public class CachingHttpClient implements HttpClient { this.identifier = identifier; } + @Override public void run() { try { cachingClient.revalidateCacheEntry(target, request, context, cacheEntry); diff --git a/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/WeakList.java b/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/WeakList.java index 5325196cc..3df063fb0 100644 --- a/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/WeakList.java +++ b/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/WeakList.java @@ -93,10 +93,12 @@ class WeakList extends AbstractList { fetchNext(); } + @Override public boolean hasNext() { return next != null; } + @Override public T next() { if (next != null) { final T result = next.get(); @@ -119,6 +121,7 @@ class WeakList extends AbstractList { next = null; } + @Override public void remove() { throw new UnsupportedOperationException(); }