hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1406359 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http: conn/ conn/params/ conn/ssl/ impl/auth/ impl/client/ impl/client/builder/ impl/conn/ impl/conn/tsccm/
Date Tue, 06 Nov 2012 21:52:36 GMT
Author: ggregory
Date: Tue Nov  6 21:52:35 2012
New Revision: 1406359

URL: http://svn.apache.org/viewvc?rev=1406359&view=rev
Log:
Add missing @Override and @Deprecated annotations.

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
Tue Nov  6 21:52:35 2012
@@ -110,7 +110,8 @@ public class BasicManagedEntity extends 
     /**
      * @deprecated (4.1) Use {@link EntityUtils#consume(HttpEntity)}
      */
-    @Override
+    @Deprecated
+	@Override
     public void consumeContent() throws IOException {
         ensureConsumed();
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
Tue Nov  6 21:52:35 2012
@@ -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";
 
 
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
Tue Nov  6 21:52:35 2012
@@ -50,7 +50,8 @@ public class ConnConnectionParamBean ext
     /**
      * @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);
     }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
Tue Nov  6 21:52:35 2012
@@ -58,7 +58,8 @@ public final class ConnManagerParams imp
      *
      * @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 imp
      *
      * @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");
         }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
Tue Nov  6 21:52:35 2012
@@ -634,7 +634,8 @@ public class SSLSocketFactory implements
     /**
      * @deprecated use {@link #createLayeredSocket(Socket, String, int, HttpParams)}
      */
-    public Socket createLayeredSocket(
+    @Deprecated
+	public Socket createLayeredSocket(
         final Socket socket,
         final String host,
         final int port,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
Tue Nov  6 21:52:35 2012
@@ -81,7 +81,8 @@ public class NegotiateScheme extends GGS
         return "Negotiate";
     }
 
-    public Header authenticate(
+    @Override
+	public Header authenticate(
             final Credentials credentials,
             final HttpRequest request) throws AuthenticationException {
         return authenticate(credentials, request, null);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
Tue Nov  6 21:52:35 2012
@@ -776,7 +776,8 @@ public abstract class AbstractHttpClient
         protocolProcessor = null;
     }
 
-    public final CloseableHttpResponse execute(HttpHost target, HttpRequest request,
+    @Override
+	public final CloseableHttpResponse execute(HttpHost target, HttpRequest request,
                                       HttpContext context)
         throws IOException, ClientProtocolException {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
Tue Nov  6 21:52:35 2012
@@ -55,6 +55,7 @@ import org.apache.http.util.EntityUtils;
  * 
  * @deprecated (4.3) use {@link HttpClientBuilder}.
  */
+@Deprecated
 @ThreadSafe
 public class AutoRetryHttpClient implements HttpClient {
 

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=1406359&r1=1406358&r2=1406359&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
Tue Nov  6 21:52:35 2012
@@ -159,7 +159,8 @@ public class DefaultHttpRequestRetryHand
      * 
      * @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();

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
Tue Nov  6 21:52:35 2012
@@ -143,7 +143,8 @@ class InternalHttpClient extends Closeab
         return context;
     }
 
-    public CloseableHttpResponse execute(
+    @Override
+	public CloseableHttpResponse execute(
             final HttpHost target,
             final HttpRequest request,
             final HttpContext context) throws IOException, ClientProtocolException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
Tue Nov  6 21:52:35 2012
@@ -128,7 +128,8 @@ public abstract class AbstractClientConn
     /**
      * @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");
         }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
Tue Nov  6 21:52:35 2012
@@ -74,7 +74,8 @@ public abstract class AbstractPooledConn
      * 
      * @deprecated (4.0.1) 
      */
-    protected AbstractPoolEntry getPoolEntry() {
+    @Deprecated
+	protected AbstractPoolEntry getPoolEntry() {
         return this.poolEntry;
     }
 
@@ -95,7 +96,8 @@ public abstract class AbstractPooledConn
     /**
      * @deprecated (4.1)  use {@link #assertValid(AbstractPoolEntry)}
      */
-    protected final void assertAttached() {
+    @Deprecated
+	protected final void assertAttached() {
         if (poolEntry == null) {
             throw new ConnectionShutdownException();
         }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
Tue Nov  6 21:52:35 2012
@@ -61,6 +61,7 @@ import org.apache.http.util.CharArrayBuf
  * 
  * @deprecated (4.2) use {@link DefaultHttpResponseParser}
  */
+@Deprecated
 @ThreadSafe // no public methods
 public class DefaultResponseParser extends AbstractMessageParser<HttpMessage> {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
Tue Nov  6 21:52:35 2012
@@ -107,7 +107,8 @@ public class SingleClientConnManager imp
      *
      * @deprecated (4.1)  use {@link SingleClientConnManager#SingleClientConnManager(SchemeRegistry)}
      */
-    public SingleClientConnManager(HttpParams params,
+    @Deprecated
+	public SingleClientConnManager(HttpParams params,
                                    SchemeRegistry schreg) {
         this(schreg);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
Tue Nov  6 21:52:35 2012
@@ -149,7 +149,8 @@ public class ConnPoolByRoute extends Abs
      *
      * @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));

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
Tue Nov  6 21:52:35 2012
@@ -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() {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java?rev=1406359&r1=1406358&r2=1406359&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
Tue Nov  6 21:52:35 2012
@@ -149,7 +149,8 @@ public class ThreadSafeClientConnManager
      *
      * @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
      *
      * @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);
     }
 



Mime
View raw message