hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1329789 - in /httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http: ./ entity/ params/ protocol/ util/
Date Tue, 24 Apr 2012 15:28:52 GMT
Author: sebb
Date: Tue Apr 24 15:28:51 2012
New Revision: 1329789

URL: http://svn.apache.org/viewvc?rev=1329789&view=rev
Log:
Add since markers to @deprecated annotations

Modified:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/EntityUtils.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java Tue
Apr 24 15:28:51 2012
@@ -189,7 +189,7 @@ public interface HttpEntity {
      *
      * @throws IOException if an I/O error occurs.
      *
-     * @deprecated Use {@link org.apache.http.util.EntityUtils#consume(HttpEntity)}
+     * @deprecated (4.1) Use {@link org.apache.http.util.EntityUtils#consume(HttpEntity)}
      *
      * @see #getContent() and #writeTo(OutputStream)
      */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
Tue Apr 24 15:28:51 2012
@@ -175,7 +175,7 @@ public abstract class AbstractHttpEntity
     /**
      * The default implementation does not consume anything.
      *
-     * @deprecated Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
+     * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
      * otherwise call {@link #writeTo(OutputStream)} which is required to free the resources.
      */
     @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java
Tue Apr 24 15:28:51 2012
@@ -128,7 +128,7 @@ public class BasicHttpEntity extends Abs
     /**
      * Closes the content InputStream.
      *
-     * @deprecated Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
+     * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
      * otherwise call {@link #writeTo(OutputStream)} which is required to free the resources.
      */
     @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
Tue Apr 24 15:28:51 2012
@@ -42,7 +42,7 @@ import org.apache.http.annotation.NotThr
 @NotThreadSafe
 public class ByteArrayEntity extends AbstractHttpEntity implements Cloneable {
 
-    @Deprecated
+    @Deprecated // 4.1.2
     protected final byte[] content;
     private final byte[] b;
     private final int off, len;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java
Tue Apr 24 15:28:51 2012
@@ -46,7 +46,7 @@ public class FileEntity extends Abstract
     protected final File file;
 
     /**
-     * @deprecated {@link #FileEntity(File, ContentType)}
+     * @deprecated (4.1.3) {@link #FileEntity(File, ContentType)}
      */
     @Deprecated
     public FileEntity(final File file, final String contentType) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java
Tue Apr 24 15:28:51 2012
@@ -103,7 +103,7 @@ public class HttpEntityWrapper implement
     }
 
     /**
-     * @deprecated Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
+     * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
      * otherwise call {@link #writeTo(OutputStream)} which is required to free the resources.
      */
     @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java
Tue Apr 24 15:28:51 2012
@@ -113,7 +113,7 @@ public class InputStreamEntity extends A
     }
 
     /**
-     * @deprecated Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
+     * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()}
on that;
      * otherwise call {@link #writeTo(OutputStream)} which is required to free the resources.
      */
     @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java
Tue Apr 24 15:28:51 2012
@@ -89,7 +89,7 @@ public class StringEntity extends Abstra
      * @since 4.1
      * @throws IllegalArgumentException if the string parameter is null
      *
-     * @deprecated use {@link #StringEntity(String, ContentType)}
+     * @deprecated (4.1.3) use {@link #StringEntity(String, ContentType)}
      */
     @Deprecated
     public StringEntity(final String string, String mimeType, String charset)

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
Tue Apr 24 15:28:51 2012
@@ -131,7 +131,7 @@ public class BasicHttpParams extends Abs
      * @return  a new set of params holding a copy of the
      *          <i>local</i> parameters in this object.
      *
-     * @deprecated
+     * @deprecated (4.1)
      * @throws UnsupportedOperationException if the clone() fails
      */
     @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
Tue Apr 24 15:28:51 2012
@@ -63,7 +63,7 @@ public final class DefaultedHttpParams e
     /**
      * Creates a copy of the local collection with the same default
      *
-     * @deprecated
+     * @deprecated (4.1)
      */
     @Deprecated
     public HttpParams copy() {
@@ -103,7 +103,7 @@ public final class DefaultedHttpParams e
     /**
      *
      * @return the default HttpParams collection
-     * @deprecated (4.2) do not use, will be removed in a later version
+     * @deprecated (4.1.1) do not use, will be removed in a later version
      */
     @Deprecated
     public HttpParams getDefaults() {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java
Tue Apr 24 15:28:51 2012
@@ -74,7 +74,7 @@ public interface HttpParams {
      *
      * @return  a new set of parameters holding the same values as this one
      *
-     * @deprecated
+     * @deprecated (4.1)
      */
     @Deprecated
     HttpParams copy();

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java
Tue Apr 24 15:28:51 2012
@@ -69,27 +69,27 @@ public final class HTTP {
     public static final Charset DEF_CONTENT_CHARSET = Consts.ISO_8859_1;
     public static final Charset DEF_PROTOCOL_CHARSET = Consts.ASCII;
     
-    @Deprecated
+    @Deprecated // 4.2
     public static final String UTF_8 = "UTF-8";
-    @Deprecated
+    @Deprecated // 4.2
     public static final String UTF_16 = "UTF-16";
-    @Deprecated
+    @Deprecated // 4.2
     public static final String US_ASCII = "US-ASCII";
-    @Deprecated
+    @Deprecated // 4.2
     public static final String ASCII = "ASCII";
-    @Deprecated
+    @Deprecated // 4.2
     public static final String ISO_8859_1 = "ISO-8859-1";
-    @Deprecated
+    @Deprecated // 4.2
     public static final String DEFAULT_CONTENT_CHARSET = ISO_8859_1;
-    @Deprecated
+    @Deprecated // 4.2
     public static final String DEFAULT_PROTOCOL_CHARSET = US_ASCII;
-    @Deprecated
+    @Deprecated // 4.2
     public final static String OCTET_STREAM_TYPE = "application/octet-stream";
-    @Deprecated
+    @Deprecated // 4.2
     public final static String PLAIN_TEXT_TYPE = "text/plain";
-    @Deprecated
+    @Deprecated // 4.2
     public final static String CHARSET_PARAM = "; charset=";
-    @Deprecated
+    @Deprecated // 4.2
     public final static String DEFAULT_CONTENT_TYPE = OCTET_STREAM_TYPE;
 
     public static boolean isWhitespace(char ch) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
Tue Apr 24 15:28:51 2012
@@ -148,7 +148,7 @@ public class HttpService {
      * @param connStrategy     the connection reuse strategy
      * @param responseFactory  the response factory
      *
-     * @deprecated use {@link HttpService#HttpService(HttpProcessor,
+     * @deprecated (4.1) use {@link HttpService#HttpService(HttpProcessor,
      *  ConnectionReuseStrategy, HttpResponseFactory, HttpRequestHandlerResolver, HttpParams)}
      */
     @Deprecated
@@ -163,7 +163,7 @@ public class HttpService {
     }
 
     /**
-     * @deprecated set {@link HttpProcessor} using constructor
+     * @deprecated (4.1) set {@link HttpProcessor} using constructor
      */
     @Deprecated
     public void setHttpProcessor(final HttpProcessor processor) {
@@ -174,7 +174,7 @@ public class HttpService {
     }
 
     /**
-     * @deprecated set {@link ConnectionReuseStrategy} using constructor
+     * @deprecated (4.1) set {@link ConnectionReuseStrategy} using constructor
      */
     @Deprecated
     public void setConnReuseStrategy(final ConnectionReuseStrategy connStrategy) {
@@ -185,7 +185,7 @@ public class HttpService {
     }
 
     /**
-     * @deprecated set {@link HttpResponseFactory} using constructor
+     * @deprecated (4.1) set {@link HttpResponseFactory} using constructor
      */
     @Deprecated
     public void setResponseFactory(final HttpResponseFactory responseFactory) {
@@ -196,7 +196,7 @@ public class HttpService {
     }
 
     /**
-     * @deprecated set {@link HttpResponseFactory} using constructor
+     * @deprecated (4.1) set {@link HttpResponseFactory} using constructor
      */
     @Deprecated
     public void setParams(final HttpParams params) {
@@ -204,7 +204,7 @@ public class HttpService {
     }
 
     /**
-     * @deprecated set {@link HttpRequestHandlerResolver} using constructor
+     * @deprecated (4.1) set {@link HttpRequestHandlerResolver} using constructor
      */
     @Deprecated
     public void setHandlerResolver(final HttpRequestHandlerResolver handlerResolver) {
@@ -212,7 +212,7 @@ public class HttpService {
     }
 
     /**
-     * @deprecated set {@link HttpExpectationVerifier} using constructor
+     * @deprecated (4.1) set {@link HttpExpectationVerifier} using constructor
      */
     @Deprecated
     public void setExpectationVerifier(final HttpExpectationVerifier expectationVerifier)
{

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
Tue Apr 24 15:28:51 2012
@@ -32,7 +32,7 @@ package org.apache.http.protocol;
  *
  * @since 4.0
  * 
- * @deprecated HttpContext instances may not be shared by multiple threads
+ * @deprecated (4.2) HttpContext instances may not be shared by multiple threads
  */
 @Deprecated
 public class SyncBasicHttpContext extends BasicHttpContext {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java
Tue Apr 24 15:28:51 2012
@@ -86,7 +86,7 @@ public class UriPatternMatcher<T> {
     }
 
     /**
-     * @deprecated use {@link #setObjects(Map)}
+     * @deprecated (4.1) use {@link #setObjects(Map)}
      */
     @Deprecated
     public synchronized void setHandlers(final Map<String, T> map) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/EntityUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/EntityUtils.java?rev=1329789&r1=1329788&r2=1329789&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/EntityUtils.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/EntityUtils.java
Tue Apr 24 15:28:51 2012
@@ -132,7 +132,7 @@ public final class EntityUtils {
      * @throws ParseException if header elements cannot be parsed
      * @throws IllegalArgumentException if entity is null
      *
-     * @deprecated use {@link ContentType#getOrDefault(HttpEntity)}
+     * @deprecated (4.1.3) use {@link ContentType#getOrDefault(HttpEntity)}
      */
     @Deprecated
     public static String getContentCharSet(final HttpEntity entity) throws ParseException
{
@@ -162,7 +162,7 @@ public final class EntityUtils {
      *
      * @since 4.1
      *
-     * @deprecated use {@link ContentType#getOrDefault(HttpEntity)}
+     * @deprecated (4.1.3) use {@link ContentType#getOrDefault(HttpEntity)}
      */
     @Deprecated
     public static String getContentMimeType(final HttpEntity entity) throws ParseException
{



Mime
View raw message