You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/01/24 18:02:10 UTC
svn commit: r1561063 [3/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-...
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java Fri Jan 24 17:02:05 2014
@@ -65,6 +65,7 @@ public abstract class CloseableHttpClien
/**
* {@inheritDoc}
*/
+ @Override
public CloseableHttpResponse execute(
final HttpHost target,
final HttpRequest request,
@@ -75,6 +76,7 @@ public abstract class CloseableHttpClien
/**
* {@inheritDoc}
*/
+ @Override
public CloseableHttpResponse execute(
final HttpUriRequest request,
final HttpContext context) throws IOException, ClientProtocolException {
@@ -101,6 +103,7 @@ public abstract class CloseableHttpClien
/**
* {@inheritDoc}
*/
+ @Override
public CloseableHttpResponse execute(
final HttpUriRequest request) throws IOException, ClientProtocolException {
return execute(request, (HttpContext) null);
@@ -109,6 +112,7 @@ public abstract class CloseableHttpClien
/**
* {@inheritDoc}
*/
+ @Override
public CloseableHttpResponse execute(
final HttpHost target,
final HttpRequest request) throws IOException, ClientProtocolException {
@@ -130,6 +134,7 @@ public abstract class CloseableHttpClien
* @throws IOException in case of a problem or the connection was aborted
* @throws ClientProtocolException in case of an http protocol error
*/
+ @Override
public <T> T execute(final HttpUriRequest request,
final ResponseHandler<? extends T> responseHandler) throws IOException,
ClientProtocolException {
@@ -153,6 +158,7 @@ public abstract class CloseableHttpClien
* @throws IOException in case of a problem or the connection was aborted
* @throws ClientProtocolException in case of an http protocol error
*/
+ @Override
public <T> T execute(final HttpUriRequest request,
final ResponseHandler<? extends T> responseHandler, final HttpContext context)
throws IOException, ClientProtocolException {
@@ -179,6 +185,7 @@ public abstract class CloseableHttpClien
* @throws IOException in case of a problem or the connection was aborted
* @throws ClientProtocolException in case of an http protocol error
*/
+ @Override
public <T> T execute(final HttpHost target, final HttpRequest request,
final ResponseHandler<? extends T> responseHandler) throws IOException,
ClientProtocolException {
@@ -206,6 +213,7 @@ public abstract class CloseableHttpClien
* @throws IOException in case of a problem or the connection was aborted
* @throws ClientProtocolException in case of an http protocol error
*/
+ @Override
public <T> T execute(final HttpHost target, final HttpRequest request,
final ResponseHandler<? extends T> responseHandler, final HttpContext context)
throws IOException, ClientProtocolException {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java Fri Jan 24 17:02:05 2014
@@ -57,6 +57,7 @@ class CloseableHttpResponseProxy impleme
EntityUtils.consume(entity);
}
+ @Override
public Object invoke(
final Object proxy, final Method method, final Object[] args) throws Throwable {
final String mname = method.getName();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java Fri Jan 24 17:02:05 2014
@@ -42,11 +42,13 @@ import org.apache.http.client.Connection
*/
public class DefaultBackoffStrategy implements ConnectionBackoffStrategy {
+ @Override
public boolean shouldBackoff(final Throwable t) {
return (t instanceof SocketTimeoutException
|| t instanceof ConnectException);
}
+ @Override
public boolean shouldBackoff(final HttpResponse resp) {
return (resp.getStatusLine().getStatusCode() == HttpStatus.SC_SERVICE_UNAVAILABLE);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java Fri Jan 24 17:02:05 2014
@@ -50,6 +50,7 @@ public class DefaultConnectionKeepAliveS
public static final DefaultConnectionKeepAliveStrategy INSTANCE = new DefaultConnectionKeepAliveStrategy();
+ @Override
public long getKeepAliveDuration(final HttpResponse response, final HttpContext context) {
Args.notNull(response, "HTTP response");
final HeaderElementIterator it = new BasicHeaderElementIterator(
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java Fri Jan 24 17:02:05 2014
@@ -124,6 +124,7 @@ public class DefaultHttpRequestRetryHand
* Used <code>retryCount</code> and <code>requestSentRetryEnabled</code> to determine
* if the given method should be retried.
*/
+ @Override
public boolean retryRequest(
final IOException exception,
final int executionCount,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java Fri Jan 24 17:02:05 2014
@@ -94,6 +94,7 @@ public class DefaultRedirectStrategy imp
super();
}
+ @Override
public boolean isRedirected(
final HttpRequest request,
final HttpResponse response,
@@ -210,6 +211,7 @@ public class DefaultRedirectStrategy imp
return false;
}
+ @Override
public HttpUriRequest getRedirect(
final HttpRequest request,
final HttpResponse response,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java Fri Jan 24 17:02:05 2014
@@ -68,11 +68,13 @@ public class DefaultServiceUnavailableRe
this(1, 1000);
}
+ @Override
public boolean retryRequest(final HttpResponse response, final int executionCount, final HttpContext context) {
return executionCount <= maxRetries &&
response.getStatusLine().getStatusCode() == HttpStatus.SC_SERVICE_UNAVAILABLE;
}
+ @Override
public long getRetryInterval() {
return retryInterval;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java Fri Jan 24 17:02:05 2014
@@ -59,6 +59,7 @@ public class DefaultUserTokenHandler imp
public static final DefaultUserTokenHandler INSTANCE = new DefaultUserTokenHandler();
+ @Override
public Object getUserToken(final HttpContext context) {
final HttpClientContext clientContext = HttpClientContext.adapt(context);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java Fri Jan 24 17:02:05 2014
@@ -65,15 +65,18 @@ public class EntityEnclosingRequestWrapp
setEntity(request.getEntity());
}
+ @Override
public HttpEntity getEntity() {
return this.entity;
}
+ @Override
public void setEntity(final HttpEntity entity) {
this.entity = entity != null ? new EntityWrapper(entity) : null;
this.consumed = false;
}
+ @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/impl/client/FutureRequestExecutionService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java Fri Jan 24 17:02:05 2014
@@ -132,6 +132,7 @@ public class FutureRequestExecutionServi
return metrics;
}
+ @Override
public void close() throws IOException {
closed.set(true);
executorService.shutdownNow();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpRequestTaskCallable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpRequestTaskCallable.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpRequestTaskCallable.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpRequestTaskCallable.java Fri Jan 24 17:02:05 2014
@@ -78,6 +78,7 @@ class HttpRequestTaskCallable<V> impleme
return ended;
}
+ @Override
public V call() throws Exception {
if (!cancelled.get()) {
try {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java Fri Jan 24 17:02:05 2014
@@ -189,6 +189,7 @@ class InternalHttpClient extends Closeab
}
}
+ @Override
public void close() {
this.connManager.shutdown();
if (this.closeables != null) {
@@ -202,37 +203,45 @@ class InternalHttpClient extends Closeab
}
}
+ @Override
public HttpParams getParams() {
throw new UnsupportedOperationException();
}
+ @Override
public ClientConnectionManager getConnectionManager() {
return new ClientConnectionManager() {
+ @Override
public void shutdown() {
connManager.shutdown();
}
+ @Override
public ClientConnectionRequest requestConnection(
final HttpRoute route, final Object state) {
throw new UnsupportedOperationException();
}
+ @Override
public void releaseConnection(
final ManagedClientConnection conn,
final long validDuration, final TimeUnit timeUnit) {
throw new UnsupportedOperationException();
}
+ @Override
public SchemeRegistry getSchemeRegistry() {
throw new UnsupportedOperationException();
}
+ @Override
public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
connManager.closeIdleConnections(idletime, tunit);
}
+ @Override
public void closeExpiredConnections() {
connManager.closeExpiredConnections();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java Fri Jan 24 17:02:05 2014
@@ -110,41 +110,50 @@ class MinimalHttpClient extends Closeabl
}
}
+ @Override
public HttpParams getParams() {
return this.params;
}
+ @Override
public void close() {
this.connManager.shutdown();
}
+ @Override
public ClientConnectionManager getConnectionManager() {
return new ClientConnectionManager() {
+ @Override
public void shutdown() {
connManager.shutdown();
}
+ @Override
public ClientConnectionRequest requestConnection(
final HttpRoute route, final Object state) {
throw new UnsupportedOperationException();
}
+ @Override
public void releaseConnection(
final ManagedClientConnection conn,
final long validDuration, final TimeUnit timeUnit) {
throw new UnsupportedOperationException();
}
+ @Override
public SchemeRegistry getSchemeRegistry() {
throw new UnsupportedOperationException();
}
+ @Override
public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
connManager.closeIdleConnections(idletime, tunit);
}
+ @Override
public void closeExpiredConnections() {
connManager.closeExpiredConnections();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java Fri Jan 24 17:02:05 2014
@@ -40,6 +40,7 @@ public class NoopUserTokenHandler implem
public static final NoopUserTokenHandler INSTANCE = new NoopUserTokenHandler();
+ @Override
public Object getUserToken(final HttpContext context) {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java Fri Jan 24 17:02:05 2014
@@ -37,10 +37,12 @@ import org.apache.http.client.Connection
*/
public class NullBackoffStrategy implements ConnectionBackoffStrategy {
+ @Override
public boolean shouldBackoff(final Throwable t) {
return false;
}
+ @Override
public boolean shouldBackoff(final HttpResponse resp) {
return false;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java Fri Jan 24 17:02:05 2014
@@ -95,6 +95,7 @@ public class RequestWrapper extends Abst
setHeaders(this.original.getAllHeaders());
}
+ @Override
public String getMethod() {
return this.method;
}
@@ -104,6 +105,7 @@ public class RequestWrapper extends Abst
this.method = method;
}
+ @Override
public ProtocolVersion getProtocolVersion() {
if (this.version == null) {
this.version = HttpProtocolParams.getVersion(getParams());
@@ -116,6 +118,7 @@ public class RequestWrapper extends Abst
}
+ @Override
public URI getURI() {
return this.uri;
}
@@ -124,6 +127,7 @@ public class RequestWrapper extends Abst
this.uri = uri;
}
+ @Override
public RequestLine getRequestLine() {
final String method = getMethod();
final ProtocolVersion ver = getProtocolVersion();
@@ -137,10 +141,12 @@ public class RequestWrapper extends Abst
return new BasicRequestLine(method, uritext, ver);
}
+ @Override
public void abort() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
+ @Override
public boolean isAborted() {
return false;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemClock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemClock.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemClock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemClock.java Fri Jan 24 17:02:05 2014
@@ -33,6 +33,7 @@ package org.apache.http.impl.client;
*/
class SystemClock implements Clock {
+ @Override
public long getCurrentTime() {
return System.currentTimeMillis();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java Fri Jan 24 17:02:05 2014
@@ -78,6 +78,7 @@ public class SystemDefaultCredentialsPro
this.internal = new BasicCredentialsProvider();
}
+ @Override
public void setCredentials(final AuthScope authscope, final Credentials credentials) {
internal.setCredentials(authscope, credentials);
}
@@ -96,6 +97,7 @@ public class SystemDefaultCredentialsPro
requestorType);
}
+ @Override
public Credentials getCredentials(final AuthScope authscope) {
Args.notNull(authscope, "Auth scope");
final Credentials localcreds = internal.getCredentials(authscope);
@@ -117,6 +119,7 @@ public class SystemDefaultCredentialsPro
return null;
}
+ @Override
public void clear() {
internal.clear();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java Fri Jan 24 17:02:05 2014
@@ -155,6 +155,7 @@ public class BasicHttpClientConnectionMa
}
}
+ @Override
public void close() {
shutdown();
}
@@ -183,17 +184,20 @@ public class BasicHttpClientConnectionMa
this.connConfig = connConfig != null ? connConfig : ConnectionConfig.DEFAULT;
}
+ @Override
public final ConnectionRequest requestConnection(
final HttpRoute route,
final Object state) {
Args.notNull(route, "Route");
return new ConnectionRequest() {
+ @Override
public boolean cancel() {
// Nothing to abort, since requests are immediate.
return false;
}
+ @Override
public HttpClientConnection get(final long timeout, final TimeUnit tunit) {
return BasicHttpClientConnectionManager.this.getConnection(
route, state);
@@ -258,6 +262,7 @@ public class BasicHttpClientConnectionMa
return this.conn;
}
+ @Override
public synchronized void releaseConnection(
final HttpClientConnection conn,
final Object state,
@@ -300,6 +305,7 @@ public class BasicHttpClientConnectionMa
}
}
+ @Override
public void connect(
final HttpClientConnection conn,
final HttpRoute route,
@@ -319,6 +325,7 @@ public class BasicHttpClientConnectionMa
connectTimeout, this.socketConfig, context);
}
+ @Override
public void upgrade(
final HttpClientConnection conn,
final HttpRoute route,
@@ -329,12 +336,14 @@ public class BasicHttpClientConnectionMa
this.connectionOperator.upgrade(this.conn, route.getTargetHost(), context);
}
+ @Override
public void routeComplete(
final HttpClientConnection conn,
final HttpRoute route,
final HttpContext context) throws IOException {
}
+ @Override
public synchronized void closeExpiredConnections() {
if (this.shutdown) {
return;
@@ -344,6 +353,7 @@ public class BasicHttpClientConnectionMa
}
}
+ @Override
public synchronized void closeIdleConnections(final long idletime, final TimeUnit tunit) {
Args.notNull(tunit, "Time unit");
if (this.shutdown) {
@@ -361,6 +371,7 @@ public class BasicHttpClientConnectionMa
}
}
+ @Override
public synchronized void shutdown() {
if (this.shutdown) {
return;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java Fri Jan 24 17:02:05 2014
@@ -117,6 +117,7 @@ class CPoolProxy implements InvocationHa
}
}
+ @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/conn/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java Fri Jan 24 17:02:05 2014
@@ -69,6 +69,7 @@ public class DefaultHttpResponseParserFa
this(null, null);
}
+ @Override
public HttpMessageParser<HttpResponse> create(final SessionInputBuffer buffer,
final MessageConstraints constraints) {
return new DefaultHttpResponseParser(buffer, lineParser, responseFactory, constraints);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java Fri Jan 24 17:02:05 2014
@@ -86,6 +86,7 @@ public class DefaultManagedHttpClientCon
this(id, buffersize, buffersize, null, null, null, null, null, null, null);
}
+ @Override
public String getId() {
return this.id;
}
@@ -96,14 +97,17 @@ public class DefaultManagedHttpClientCon
super.shutdown();
}
+ @Override
public Object getAttribute(final String id) {
return this.attributes.get(id);
}
+ @Override
public Object removeAttribute(final String id) {
return this.attributes.remove(id);
}
+ @Override
public void setAttribute(final String id, final Object obj) {
this.attributes.put(id, obj);
}
@@ -123,6 +127,7 @@ public class DefaultManagedHttpClientCon
return super.getSocket();
}
+ @Override
public SSLSession getSSLSession() {
final Socket socket = super.getSocket();
if (socket instanceof SSLSocket) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultRoutePlanner.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultRoutePlanner.java Fri Jan 24 17:02:05 2014
@@ -59,6 +59,7 @@ public class DefaultRoutePlanner impleme
DefaultSchemePortResolver.INSTANCE;
}
+ @Override
public HttpRoute determineRoute(
final HttpHost host,
final HttpRequest request,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultSchemePortResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultSchemePortResolver.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultSchemePortResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultSchemePortResolver.java Fri Jan 24 17:02:05 2014
@@ -42,6 +42,7 @@ public class DefaultSchemePortResolver i
public static final DefaultSchemePortResolver INSTANCE = new DefaultSchemePortResolver();
+ @Override
public int resolve(final HttpHost host) throws UnsupportedSchemeException {
Args.notNull(host, "HTTP host");
final int port = host.getPort();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java Fri Jan 24 17:02:05 2014
@@ -80,6 +80,7 @@ public class InMemoryDnsResolver impleme
/**
* {@inheritDoc}
*/
+ @Override
public InetAddress[] resolve(final String host) throws UnknownHostException {
final InetAddress[] resolvedAddresses = dnsMap.get(host);
if (log.isInfoEnabled()) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java Fri Jan 24 17:02:05 2014
@@ -84,6 +84,7 @@ public class ManagedHttpClientConnection
this(null, null);
}
+ @Override
public ManagedHttpClientConnection create(final HttpRoute route, final ConnectionConfig config) {
final ConnectionConfig cconfig = config != null ? config : ConnectionConfig.DEFAULT;
CharsetDecoder chardecoder = null;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java Fri Jan 24 17:02:05 2014
@@ -171,6 +171,7 @@ public class PoolingHttpClientConnection
}
}
+ @Override
public void close() {
shutdown();
}
@@ -207,6 +208,7 @@ public class PoolingHttpClientConnection
return buf.toString();
}
+ @Override
public ConnectionRequest requestConnection(
final HttpRoute route,
final Object state) {
@@ -217,10 +219,12 @@ public class PoolingHttpClientConnection
final Future<CPoolEntry> future = this.pool.lease(route, state, null);
return new ConnectionRequest() {
+ @Override
public boolean cancel() {
return future.cancel(true);
}
+ @Override
public HttpClientConnection get(
final long timeout,
final TimeUnit tunit) throws InterruptedException, ExecutionException, ConnectionPoolTimeoutException {
@@ -251,6 +255,7 @@ public class PoolingHttpClientConnection
}
}
+ @Override
public void releaseConnection(
final HttpClientConnection managedConn,
final Object state,
@@ -285,6 +290,7 @@ public class PoolingHttpClientConnection
}
}
+ @Override
public void connect(
final HttpClientConnection managedConn,
final HttpRoute route,
@@ -315,6 +321,7 @@ public class PoolingHttpClientConnection
conn, host, localAddress, connectTimeout, socketConfig, context);
}
+ @Override
public void upgrade(
final HttpClientConnection managedConn,
final HttpRoute route,
@@ -329,6 +336,7 @@ public class PoolingHttpClientConnection
this.connectionOperator.upgrade(conn, route.getTargetHost(), context);
}
+ @Override
public void routeComplete(
final HttpClientConnection managedConn,
final HttpRoute route,
@@ -341,6 +349,7 @@ public class PoolingHttpClientConnection
}
}
+ @Override
public void shutdown() {
this.log.debug("Connection manager is shutting down");
try {
@@ -351,6 +360,7 @@ public class PoolingHttpClientConnection
this.log.debug("Connection manager shut down");
}
+ @Override
public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
if (this.log.isDebugEnabled()) {
this.log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
@@ -358,39 +368,48 @@ public class PoolingHttpClientConnection
this.pool.closeIdle(idleTimeout, tunit);
}
+ @Override
public void closeExpiredConnections() {
this.log.debug("Closing expired connections");
this.pool.closeExpired();
}
+ @Override
public int getMaxTotal() {
return this.pool.getMaxTotal();
}
+ @Override
public void setMaxTotal(final int max) {
this.pool.setMaxTotal(max);
}
+ @Override
public int getDefaultMaxPerRoute() {
return this.pool.getDefaultMaxPerRoute();
}
+ @Override
public void setDefaultMaxPerRoute(final int max) {
this.pool.setDefaultMaxPerRoute(max);
}
+ @Override
public int getMaxPerRoute(final HttpRoute route) {
return this.pool.getMaxPerRoute(route);
}
+ @Override
public void setMaxPerRoute(final HttpRoute route, final int max) {
this.pool.setMaxPerRoute(route, max);
}
+ @Override
public PoolStats getTotalStats() {
return this.pool.getTotalStats();
}
+ @Override
public PoolStats getStats(final HttpRoute route) {
return this.pool.getStats(route);
}
@@ -488,6 +507,7 @@ public class PoolingHttpClientConnection
ManagedHttpClientConnectionFactory.INSTANCE;
}
+ @Override
public ManagedHttpClientConnection create(final HttpRoute route) throws IOException {
ConnectionConfig config = null;
if (route.getProxyHost() != null) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java Fri Jan 24 17:02:05 2014
@@ -40,6 +40,7 @@ public class SystemDefaultDnsResolver im
public static final SystemDefaultDnsResolver INSTANCE = new SystemDefaultDnsResolver();
+ @Override
public InetAddress[] resolve(final String host) throws UnknownHostException {
return InetAddress.getAllByName(host);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java Fri Jan 24 17:02:05 2014
@@ -39,11 +39,13 @@ import org.apache.http.cookie.MalformedC
@Immutable
public abstract class AbstractCookieAttributeHandler implements CookieAttributeHandler {
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
// Do nothing
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
// Always match
return true;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java Fri Jan 24 17:02:05 2014
@@ -67,6 +67,7 @@ public class BasicClientCookie implement
*
* @return String name The name
*/
+ @Override
public String getName() {
return this.name;
}
@@ -76,6 +77,7 @@ public class BasicClientCookie implement
*
* @return String value The current value.
*/
+ @Override
public String getValue() {
return this.value;
}
@@ -85,6 +87,7 @@ public class BasicClientCookie implement
*
* @param value
*/
+ @Override
public void setValue(final String value) {
this.value = value;
}
@@ -97,6 +100,7 @@ public class BasicClientCookie implement
*
* @see #setComment(String)
*/
+ @Override
public String getComment() {
return cookieComment;
}
@@ -109,6 +113,7 @@ public class BasicClientCookie implement
*
* @see #getComment()
*/
+ @Override
public void setComment(final String comment) {
cookieComment = comment;
}
@@ -117,6 +122,7 @@ public class BasicClientCookie implement
/**
* Returns null. Cookies prior to RFC2965 do not set this attribute
*/
+ @Override
public String getCommentURL() {
return null;
}
@@ -133,6 +139,7 @@ public class BasicClientCookie implement
* @see #setExpiryDate(java.util.Date)
*
*/
+ @Override
public Date getExpiryDate() {
return cookieExpiryDate;
}
@@ -148,6 +155,7 @@ public class BasicClientCookie implement
* @see #getExpiryDate
*
*/
+ @Override
public void setExpiryDate (final Date expiryDate) {
cookieExpiryDate = expiryDate;
}
@@ -160,6 +168,7 @@ public class BasicClientCookie implement
* @return <tt>false</tt> if the cookie should be discarded at the end
* of the "session"; <tt>true</tt> otherwise
*/
+ @Override
public boolean isPersistent() {
return (null != cookieExpiryDate);
}
@@ -172,6 +181,7 @@ public class BasicClientCookie implement
*
* @see #setDomain(java.lang.String)
*/
+ @Override
public String getDomain() {
return cookieDomain;
}
@@ -183,6 +193,7 @@ public class BasicClientCookie implement
*
* @see #getDomain
*/
+ @Override
public void setDomain(final String domain) {
if (domain != null) {
cookieDomain = domain.toLowerCase(Locale.ENGLISH);
@@ -199,6 +210,7 @@ public class BasicClientCookie implement
*
* @see #setPath(java.lang.String)
*/
+ @Override
public String getPath() {
return cookiePath;
}
@@ -211,6 +223,7 @@ public class BasicClientCookie implement
* @see #getPath
*
*/
+ @Override
public void setPath(final String path) {
cookiePath = path;
}
@@ -219,6 +232,7 @@ public class BasicClientCookie implement
* @return <code>true</code> if this cookie should only be sent over secure connections.
* @see #setSecure(boolean)
*/
+ @Override
public boolean isSecure() {
return isSecure;
}
@@ -235,6 +249,7 @@ public class BasicClientCookie implement
*
* @see #isSecure()
*/
+ @Override
public void setSecure (final boolean secure) {
isSecure = secure;
}
@@ -243,6 +258,7 @@ public class BasicClientCookie implement
/**
* Returns null. Cookies prior to RFC2965 do not set this attribute
*/
+ @Override
public int[] getPorts() {
return null;
}
@@ -257,6 +273,7 @@ public class BasicClientCookie implement
* @see #setVersion(int)
*
*/
+ @Override
public int getVersion() {
return cookieVersion;
}
@@ -269,6 +286,7 @@ public class BasicClientCookie implement
*
* @see #getVersion
*/
+ @Override
public void setVersion(final int version) {
cookieVersion = version;
}
@@ -279,6 +297,7 @@ public class BasicClientCookie implement
*
* @return <tt>true</tt> if the cookie has expired.
*/
+ @Override
public boolean isExpired(final Date date) {
Args.notNull(date, "Date");
return (cookieExpiryDate != null
@@ -289,10 +308,12 @@ public class BasicClientCookie implement
this.attribs.put(name, value);
}
+ @Override
public String getAttribute(final String name) {
return this.attribs.get(name);
}
+ @Override
public boolean containsAttribute(final String name) {
return this.attribs.get(name) != null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java Fri Jan 24 17:02:05 2014
@@ -61,6 +61,7 @@ public class BasicClientCookie2 extends
return this.ports;
}
+ @Override
public void setPorts(final int[] ports) {
this.ports = ports;
}
@@ -70,10 +71,12 @@ public class BasicClientCookie2 extends
return this.commentURL;
}
+ @Override
public void setCommentURL(final String commentURL) {
this.commentURL = commentURL;
}
+ @Override
public void setDiscard(final boolean discard) {
this.discard = discard;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java Fri Jan 24 17:02:05 2014
@@ -42,6 +42,7 @@ public class BasicCommentHandler extends
super();
}
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java Fri Jan 24 17:02:05 2014
@@ -46,6 +46,7 @@ public class BasicDomainHandler implemen
super();
}
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -58,6 +59,7 @@ public class BasicDomainHandler implemen
cookie.setDomain(value);
}
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -96,6 +98,7 @@ public class BasicDomainHandler implemen
}
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java Fri Jan 24 17:02:05 2014
@@ -49,6 +49,7 @@ public class BasicExpiresHandler extends
this.datepatterns = datepatterns;
}
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java Fri Jan 24 17:02:05 2014
@@ -44,6 +44,7 @@ public class BasicMaxAgeHandler extends
super();
}
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java Fri Jan 24 17:02:05 2014
@@ -47,12 +47,14 @@ public class BasicPathHandler implements
super();
}
+ @Override
public void parse(
final SetCookie cookie, final String value) throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
cookie.setPath(!TextUtils.isBlank(value) ? value : "/");
}
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
if (!match(cookie, origin)) {
@@ -62,6 +64,7 @@ public class BasicPathHandler implements
}
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java Fri Jan 24 17:02:05 2014
@@ -44,6 +44,7 @@ public class BasicSecureHandler extends
super();
}
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java Fri Jan 24 17:02:05 2014
@@ -91,6 +91,7 @@ public class BestMatchSpec implements Co
return compat;
}
+ @Override
public List<Cookie> parse(
final Header header,
final CookieOrigin origin) throws MalformedCookieException {
@@ -138,6 +139,7 @@ public class BestMatchSpec implements Co
}
}
+ @Override
public void validate(
final Cookie cookie,
final CookieOrigin origin) throws MalformedCookieException {
@@ -154,6 +156,7 @@ public class BestMatchSpec implements Co
}
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
@@ -168,6 +171,7 @@ public class BestMatchSpec implements Co
}
}
+ @Override
public List<Header> formatCookies(final List<Cookie> cookies) {
Args.notNull(cookies, "List of cookies");
int version = Integer.MAX_VALUE;
@@ -191,10 +195,12 @@ public class BestMatchSpec implements Co
}
}
+ @Override
public int getVersion() {
return getStrict().getVersion();
}
+ @Override
public Header getVersionHeader() {
return getStrict().getVersionHeader();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java Fri Jan 24 17:02:05 2014
@@ -60,6 +60,7 @@ public class BestMatchSpecFactory implem
this(null, false);
}
+ @Override
public CookieSpec newInstance(final HttpParams params) {
if (params != null) {
@@ -79,6 +80,7 @@ public class BestMatchSpecFactory implem
}
}
+ @Override
public CookieSpec create(final HttpContext context) {
return new BestMatchSpec(this.datepatterns, this.oneHeader);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java Fri Jan 24 17:02:05 2014
@@ -123,6 +123,7 @@ public class BrowserCompatSpec extends C
this(null, BrowserCompatSpecFactory.SecurityLevel.SECURITYLEVEL_DEFAULT);
}
+ @Override
public List<Cookie> parse(final Header header, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(header, "Header");
@@ -172,6 +173,7 @@ public class BrowserCompatSpec extends C
return s != null && s.startsWith("\"") && s.endsWith("\"");
}
+ @Override
public List<Header> formatCookies(final List<Cookie> cookies) {
Args.notEmpty(cookies, "List of cookies");
final CharArrayBuffer buffer = new CharArrayBuffer(20 * cookies.size());
@@ -203,10 +205,12 @@ public class BrowserCompatSpec extends C
return headers;
}
+ @Override
public int getVersion() {
return 0;
}
+ @Override
public Header getVersionHeader() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java Fri Jan 24 17:02:05 2014
@@ -69,6 +69,7 @@ public class BrowserCompatSpecFactory im
this(null, SecurityLevel.SECURITYLEVEL_DEFAULT);
}
+ @Override
public CookieSpec newInstance(final HttpParams params) {
if (params != null) {
@@ -85,6 +86,7 @@ public class BrowserCompatSpecFactory im
}
}
+ @Override
public CookieSpec create(final HttpContext context) {
return new BrowserCompatSpec(this.datepatterns);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java Fri Jan 24 17:02:05 2014
@@ -48,6 +48,7 @@ public class BrowserCompatVersionAttribu
/**
* Parse cookie version attribute.
*/
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java Fri Jan 24 17:02:05 2014
@@ -98,6 +98,7 @@ public abstract class CookieSpecBase ext
return cookies;
}
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -107,6 +108,7 @@ public abstract class CookieSpecBase ext
}
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java Fri Jan 24 17:02:05 2014
@@ -44,19 +44,23 @@ import org.apache.http.cookie.MalformedC
@NotThreadSafe // superclass is @NotThreadSafe
public class IgnoreSpec extends CookieSpecBase {
+ @Override
public int getVersion() {
return 0;
}
+ @Override
public List<Cookie> parse(final Header header, final CookieOrigin origin)
throws MalformedCookieException {
return Collections.emptyList();
}
+ @Override
public List<Header> formatCookies(final List<Cookie> cookies) {
return Collections.emptyList();
}
+ @Override
public Header getVersionHeader() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpecFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpecFactory.java Fri Jan 24 17:02:05 2014
@@ -47,10 +47,12 @@ public class IgnoreSpecFactory implement
super();
}
+ @Override
public CookieSpec newInstance(final HttpParams params) {
return new IgnoreSpec();
}
+ @Override
public CookieSpec create(final HttpContext context) {
return new IgnoreSpec();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java Fri Jan 24 17:02:05 2014
@@ -105,6 +105,7 @@ public class NetscapeDraftSpec extends C
* @return an array of <tt>Cookie</tt>s parsed from the Set-Cookie value
* @throws MalformedCookieException if an exception occurs during parsing
*/
+ @Override
public List<Cookie> parse(final Header header, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(header, "Header");
@@ -133,6 +134,7 @@ public class NetscapeDraftSpec extends C
return parse(new HeaderElement[] { parser.parseHeader(buffer, cursor) }, origin);
}
+ @Override
public List<Header> formatCookies(final List<Cookie> cookies) {
Args.notEmpty(cookies, "List of cookies");
final CharArrayBuffer buffer = new CharArrayBuffer(20 * cookies.size());
@@ -155,10 +157,12 @@ public class NetscapeDraftSpec extends C
return headers;
}
+ @Override
public int getVersion() {
return 0;
}
+ @Override
public Header getVersionHeader() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java Fri Jan 24 17:02:05 2014
@@ -58,6 +58,7 @@ public class NetscapeDraftSpecFactory im
this(null);
}
+ @Override
public CookieSpec newInstance(final HttpParams params) {
if (params != null) {
@@ -74,6 +75,7 @@ public class NetscapeDraftSpecFactory im
}
}
+ @Override
public CookieSpec create(final HttpContext context) {
return new NetscapeDraftSpec(this.datepatterns);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java Fri Jan 24 17:02:05 2014
@@ -78,6 +78,7 @@ public class PublicSuffixFilter implemen
/**
* Never matches if the cookie's domain is from the blacklist.
*/
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
if (isForPublicSuffix(cookie)) {
return false;
@@ -85,10 +86,12 @@ public class PublicSuffixFilter implemen
return wrapped.match(cookie, origin);
}
+ @Override
public void parse(final SetCookie cookie, final String value) throws MalformedCookieException {
wrapped.parse(cookie, value);
}
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
wrapped.validate(cookie, origin);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java Fri Jan 24 17:02:05 2014
@@ -48,6 +48,7 @@ public class RFC2109DomainHandler implem
super();
}
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -60,6 +61,7 @@ public class RFC2109DomainHandler implem
cookie.setDomain(value);
}
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -106,6 +108,7 @@ public class RFC2109DomainHandler implem
}
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java Fri Jan 24 17:02:05 2014
@@ -93,6 +93,7 @@ public class RFC2109Spec extends CookieS
this(null, false);
}
+ @Override
public List<Cookie> parse(final Header header, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(header, "Header");
@@ -119,6 +120,7 @@ public class RFC2109Spec extends CookieS
super.validate(cookie, origin);
}
+ @Override
public List<Header> formatCookies(final List<Cookie> cookies) {
Args.notEmpty(cookies, "List of cookies");
List<Cookie> cookieList;
@@ -224,10 +226,12 @@ public class RFC2109Spec extends CookieS
}
}
+ @Override
public int getVersion() {
return 1;
}
+ @Override
public Header getVersionHeader() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java Fri Jan 24 17:02:05 2014
@@ -60,6 +60,7 @@ public class RFC2109SpecFactory implemen
this(null, false);
}
+ @Override
public CookieSpec newInstance(final HttpParams params) {
if (params != null) {
@@ -79,6 +80,7 @@ public class RFC2109SpecFactory implemen
}
}
+ @Override
public CookieSpec create(final HttpContext context) {
return new RFC2109Spec(this.datepatterns, this.oneHeader);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java Fri Jan 24 17:02:05 2014
@@ -45,6 +45,7 @@ public class RFC2109VersionHandler exten
super();
}
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java Fri Jan 24 17:02:05 2014
@@ -47,6 +47,7 @@ public class RFC2965CommentUrlAttributeH
super();
}
+ @Override
public void parse(final SetCookie cookie, final String commenturl)
throws MalformedCookieException {
if (cookie instanceof SetCookie2) {
@@ -55,10 +56,12 @@ public class RFC2965CommentUrlAttributeH
}
}
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java Fri Jan 24 17:02:05 2014
@@ -47,6 +47,7 @@ public class RFC2965DiscardAttributeHand
super();
}
+ @Override
public void parse(final SetCookie cookie, final String commenturl)
throws MalformedCookieException {
if (cookie instanceof SetCookie2) {
@@ -55,10 +56,12 @@ public class RFC2965DiscardAttributeHand
}
}
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java Fri Jan 24 17:02:05 2014
@@ -55,6 +55,7 @@ public class RFC2965DomainAttributeHandl
/**
* Parse cookie domain attribute.
*/
+ @Override
public void parse(
final SetCookie cookie, final String domain) throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -104,6 +105,7 @@ public class RFC2965DomainAttributeHandl
/**
* Validate cookie domain attribute.
*/
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -165,6 +167,7 @@ public class RFC2965DomainAttributeHandl
/**
* Match cookie domain attribute.
*/
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java Fri Jan 24 17:02:05 2014
@@ -104,6 +104,7 @@ public class RFC2965PortAttributeHandler
/**
* Parse cookie port attribute.
*/
+ @Override
public void parse(final SetCookie cookie, final String portValue)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -120,6 +121,7 @@ public class RFC2965PortAttributeHandler
* Validate cookie port attribute. If the Port attribute was specified
* in header, the request port must be in cookie's port list.
*/
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -140,6 +142,7 @@ public class RFC2965PortAttributeHandler
* in header, the cookie can be sent to any port. Otherwise, the request port
* must be in the cookie's port list.
*/
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java Fri Jan 24 17:02:05 2014
@@ -60,6 +60,7 @@ public class RFC2965SpecFactory implemen
this(null, false);
}
+ @Override
public CookieSpec newInstance(final HttpParams params) {
if (params != null) {
@@ -79,6 +80,7 @@ public class RFC2965SpecFactory implemen
}
}
+ @Override
public CookieSpec create(final HttpContext context) {
return new RFC2965Spec(this.datepatterns, this.oneHeader);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java Fri Jan 24 17:02:05 2014
@@ -53,6 +53,7 @@ public class RFC2965VersionAttributeHand
/**
* Parse cookie version attribute.
*/
+ @Override
public void parse(final SetCookie cookie, final String value)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -75,6 +76,7 @@ public class RFC2965VersionAttributeHand
/**
* validate cookie version attribute. Version attribute is REQUIRED.
*/
+ @Override
public void validate(final Cookie cookie, final CookieOrigin origin)
throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
@@ -87,6 +89,7 @@ public class RFC2965VersionAttributeHand
}
}
+ @Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/BackoffStrategyExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/BackoffStrategyExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/BackoffStrategyExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/BackoffStrategyExec.java Fri Jan 24 17:02:05 2014
@@ -64,6 +64,7 @@ public class BackoffStrategyExec impleme
this.backoffManager = backoffManager;
}
+ @Override
public CloseableHttpResponse execute(
final HttpRoute route,
final HttpRequestWrapper request,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ConnectionHolder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ConnectionHolder.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ConnectionHolder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ConnectionHolder.java Fri Jan 24 17:02:05 2014
@@ -90,6 +90,7 @@ class ConnectionHolder implements Connec
}
}
+ @Override
public void releaseConnection() {
synchronized (this.managedConn) {
if (this.released) {
@@ -115,6 +116,7 @@ class ConnectionHolder implements Connec
}
}
+ @Override
public void abortConnection() {
synchronized (this.managedConn) {
if (this.released) {
@@ -135,6 +137,7 @@ class ConnectionHolder implements Connec
}
}
+ @Override
public boolean cancel() {
final boolean alreadyReleased = this.released;
log.debug("Cancelling request execution");
@@ -146,6 +149,7 @@ class ConnectionHolder implements Connec
return this.released;
}
+ @Override
public void close() throws IOException {
abortConnection();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java Fri Jan 24 17:02:05 2014
@@ -129,6 +129,7 @@ public class MainClientExec implements C
this.userTokenHandler = userTokenHandler;
}
+ @Override
public CloseableHttpResponse execute(
final HttpRoute route,
final HttpRequestWrapper request,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java Fri Jan 24 17:02:05 2014
@@ -128,6 +128,7 @@ public class MinimalClientExec implement
}
}
+ @Override
public CloseableHttpResponse execute(
final HttpRoute route,
final HttpRequestWrapper request,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java Fri Jan 24 17:02:05 2014
@@ -113,6 +113,7 @@ public class ProtocolExec implements Cli
}
}
+ @Override
public CloseableHttpResponse execute(
final HttpRoute route,
final HttpRequestWrapper request,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java Fri Jan 24 17:02:05 2014
@@ -86,6 +86,7 @@ public class RedirectExec implements Cli
this.redirectStrategy = redirectStrategy;
}
+ @Override
public CloseableHttpResponse execute(
final HttpRoute route,
final HttpRequestWrapper request,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityExecHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityExecHandler.java?rev=1561063&r1=1561062&r2=1561063&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityExecHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityExecHandler.java Fri Jan 24 17:02:05 2014
@@ -68,6 +68,7 @@ class RequestEntityExecHandler implement
return consumed;
}
+ @Override
public Object invoke(
final Object proxy, final Method method, final Object[] args) throws Throwable {
try {