Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing @Override and @Deprecated annotations. 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1406359 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2012-11-06 21:52:35 +00:00
parent 6293899e61
commit fdfd59534c
17 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
View File

@ -110,7 +110,8 @@ public class BasicManagedEntity extends HttpEntityWrapper
/**
* @deprecated (4.1) Use {@link EntityUtils#consume(HttpEntity)}
*/
@Override
@Deprecated
@Override
public void consumeContent() throws IOException {
ensureConsumed();
}

3
httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
View File

@ -55,7 +55,8 @@ public interface ConnConnectionPNames {
*
* @deprecated Use custom {@link DefaultHttpResponseParser} implementation
*/
public static final String MAX_STATUS_LINE_GARBAGE = "http.connection.max-status-line-garbage";
@Deprecated
public static final String MAX_STATUS_LINE_GARBAGE = "http.connection.max-status-line-garbage";
}

3
httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
View File

@ -50,7 +50,8 @@ public class ConnConnectionParamBean extends HttpAbstractParamBean {
/**
* @deprecated (4.2) Use custom {@link DefaultHttpResponseParser} implementation
*/
public void setMaxStatusLineGarbage (final int maxStatusLineGarbage) {
@Deprecated
public void setMaxStatusLineGarbage (final int maxStatusLineGarbage) {
params.setIntParameter(ConnConnectionPNames.MAX_STATUS_LINE_GARBAGE, maxStatusLineGarbage);
}

6
httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
View File

@ -58,7 +58,8 @@ public final class ConnManagerParams implements ConnManagerPNames {
*
* @deprecated (4.1) use {@link HttpConnectionParams#getConnectionTimeout(HttpParams)}
*/
public static long getTimeout(final HttpParams params) {
@Deprecated
public static long getTimeout(final HttpParams params) {
if (params == null) {
throw new IllegalArgumentException("HTTP parameters may not be null");
}
@ -74,7 +75,8 @@ public final class ConnManagerParams implements ConnManagerPNames {
*
* @deprecated (4.1) use {@link HttpConnectionParams#setConnectionTimeout(HttpParams, int)}
*/
public static void setTimeout(final HttpParams params, long timeout) {
@Deprecated
public static void setTimeout(final HttpParams params, long timeout) {
if (params == null) {
throw new IllegalArgumentException("HTTP parameters may not be null");
}

3
httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
View File

@ -634,7 +634,8 @@ public class SSLSocketFactory implements SchemeLayeredSocketFactory,
/**
* @deprecated use {@link #createLayeredSocket(Socket, String, int, HttpParams)}
*/
public Socket createLayeredSocket(
@Deprecated
public Socket createLayeredSocket(
final Socket socket,
final String host,
final int port,

3
httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
View File

@ -81,7 +81,8 @@ public class NegotiateScheme extends GGSSchemeBase {
return "Negotiate";
}
public Header authenticate(
@Override
public Header authenticate(
final Credentials credentials,
final HttpRequest request) throws AuthenticationException {
return authenticate(credentials, request, null);

3
httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
View File

@ -776,7 +776,8 @@ public abstract class AbstractHttpClient extends CloseableHttpClient {
protocolProcessor = null;
}
public final CloseableHttpResponse execute(HttpHost target, HttpRequest request,
@Override
public final CloseableHttpResponse execute(HttpHost target, HttpRequest request,
HttpContext context)
throws IOException, ClientProtocolException {

1
httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
View File

@ -55,6 +55,7 @@ import org.apache.http.util.EntityUtils;
*
* @deprecated (4.3) use {@link HttpClientBuilder}.
*/
@Deprecated
@ThreadSafe
public class AutoRetryHttpClient implements HttpClient {

3
httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
View File

@ -159,7 +159,8 @@ public class DefaultHttpRequestRetryHandler implements HttpRequestRetryHandler {
*
* @deprecated (4.3)
*/
protected boolean requestIsAborted(final HttpRequest request) {
@Deprecated
protected boolean requestIsAborted(final HttpRequest request) {
HttpRequest req = request;
if (request instanceof RequestWrapper) { // does not forward request to original
req = ((RequestWrapper) request).getOriginal();

3
httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
View File

@ -143,7 +143,8 @@ class InternalHttpClient extends CloseableHttpClient {
return context;
}
public CloseableHttpResponse execute(
@Override
public CloseableHttpResponse execute(
final HttpHost target,
final HttpRequest request,
final HttpContext context) throws IOException, ClientProtocolException {

3
httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
View File

@ -128,7 +128,8 @@ public abstract class AbstractClientConnAdapter implements ManagedClientConnecti
/**
* @deprecated (4.1) use {@link #assertValid(OperatedClientConnection)}
*/
protected final void assertNotAborted() throws InterruptedIOException {
@Deprecated
protected final void assertNotAborted() throws InterruptedIOException {
if (isReleased()) {
throw new InterruptedIOException("Connection has been shut down");
}

6
httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
View File

@ -74,7 +74,8 @@ public abstract class AbstractPooledConnAdapter extends AbstractClientConnAdapte
*
* @deprecated (4.0.1)
*/
protected AbstractPoolEntry getPoolEntry() {
@Deprecated
protected AbstractPoolEntry getPoolEntry() {
return this.poolEntry;
}
@ -95,7 +96,8 @@ public abstract class AbstractPooledConnAdapter extends AbstractClientConnAdapte
/**
* @deprecated (4.1) use {@link #assertValid(AbstractPoolEntry)}
*/
protected final void assertAttached() {
@Deprecated
protected final void assertAttached() {
if (poolEntry == null) {
throw new ConnectionShutdownException();
}

1
httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
View File

@ -61,6 +61,7 @@ import org.apache.http.util.CharArrayBuffer;
*
* @deprecated (4.2) use {@link DefaultHttpResponseParser}
*/
@Deprecated
@ThreadSafe // no public methods
public class DefaultResponseParser extends AbstractMessageParser<HttpMessage> {

3
httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
View File

@ -107,7 +107,8 @@ public class SingleClientConnManager implements ClientConnectionManager {
*
* @deprecated (4.1) use {@link SingleClientConnManager#SingleClientConnManager(SchemeRegistry)}
*/
public SingleClientConnManager(HttpParams params,
@Deprecated
public SingleClientConnManager(HttpParams params,
SchemeRegistry schreg) {
this(schreg);
}

3
httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
View File

@ -149,7 +149,8 @@ public class ConnPoolByRoute extends AbstractConnPool {
*
* @deprecated (4.1) use {@link ConnPoolByRoute#ConnPoolByRoute(ClientConnectionOperator, ConnPerRoute, int)}
*/
public ConnPoolByRoute(final ClientConnectionOperator operator, final HttpParams params) {
@Deprecated
public ConnPoolByRoute(final ClientConnectionOperator operator, final HttpParams params) {
this(operator,
ConnManagerParams.getMaxConnectionsPerRoute(params),
ConnManagerParams.getMaxTotalConnections(params));

3
httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
View File

@ -77,7 +77,8 @@ public class RouteSpecificPool {
/**
* @deprecated (4.1) use {@link RouteSpecificPool#RouteSpecificPool(HttpRoute, ConnPerRoute)}
*/
public RouteSpecificPool(HttpRoute route, int maxEntries) {
@Deprecated
public RouteSpecificPool(HttpRoute route, int maxEntries) {
this.route = route;
this.maxEntries = maxEntries;
this.connPerRoute = new ConnPerRoute() {

6
httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
View File

@ -149,7 +149,8 @@ public class ThreadSafeClientConnManager implements ClientConnectionManager {
*
* @deprecated (4.1) use {@link ThreadSafeClientConnManager#ThreadSafeClientConnManager(SchemeRegistry)}
*/
public ThreadSafeClientConnManager(HttpParams params,
@Deprecated
public ThreadSafeClientConnManager(HttpParams params,
SchemeRegistry schreg) {
if (schreg == null) {
throw new IllegalArgumentException("Scheme registry may not be null");
@ -178,7 +179,8 @@ public class ThreadSafeClientConnManager implements ClientConnectionManager {
*
* @deprecated (4.1) use #createConnectionPool(long, TimeUnit))
*/
protected AbstractConnPool createConnectionPool(final HttpParams params) {
@Deprecated
protected AbstractConnPool createConnectionPool(final HttpParams params) {
return new ConnPoolByRoute(connOperator, params);
}