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/14 16:31:56 UTC
svn commit: r1558081 - in /httpcomponents/httpcore/branches/4.3.x:
httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/
httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/
httpcore-nio/src/main/java/org/apache/http/nio/entity/ http...
Author: olegk
Date: Tue Jan 14 15:31:55 2014
New Revision: 1558081
URL: http://svn.apache.org/r1558081
Log:
Moved deprecated classes; fixed some deprecation warnings
Added:
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java (contents, props changed)
- copied, changed from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java (contents, props changed)
- copied, changed from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ContentListener.java (contents, props changed)
- copied, changed from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java (contents, props changed)
- copied, changed from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java (contents, props changed)
- copied, changed from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java
Removed:
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java
Modified:
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java
httpcomponents/httpcore/branches/4.3.x/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
Copied: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java (from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java?p2=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java&p1=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java&r1=1557336&r2=1558081&rev=1558081&view=diff
==============================================================================
(empty)
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java (from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java?p2=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java&p1=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java&r1=1557336&r2=1558081&rev=1558081&view=diff
==============================================================================
(empty)
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ContentListener.java (from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ContentListener.java?p2=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ContentListener.java&p1=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java&r1=1557336&r2=1558081&rev=1558081&view=diff
==============================================================================
(empty)
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ContentListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ContentListener.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/ContentListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java (from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java?p2=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java&p1=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java&r1=1557336&r2=1558081&rev=1558081&view=diff
==============================================================================
(empty)
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java (from r1557336, httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java?p2=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java&p1=httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java&r1=1557336&r2=1558081&rev=1558081&view=diff
==============================================================================
(empty)
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java?rev=1558081&r1=1558080&r2=1558081&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java (original)
+++ httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java Tue Jan 14 15:31:55 2014
@@ -52,10 +52,8 @@ public abstract class AbstractContentEnc
protected final HttpTransportMetricsImpl metrics;
/**
- * @deprecated since 4.3-beta3 - use {@link #isCompleted()} or {@link #complete()} instead
- * Will probably be made private at some point.
+ * TODO: make private
*/
- @Deprecated
protected boolean completed;
/**
Modified: httpcomponents/httpcore/branches/4.3.x/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java?rev=1558081&r1=1558080&r2=1558081&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.3.x/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java (original)
+++ httpcomponents/httpcore/branches/4.3.x/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java Tue Jan 14 15:31:55 2014
@@ -54,6 +54,7 @@ public class ByteArrayEntity extends Abs
/**
* @since 4.2
*/
+ @SuppressWarnings("deprecation")
public ByteArrayEntity(final byte[] b, final ContentType contentType) {
super();
Args.notNull(b, "Source byte array");
@@ -69,6 +70,7 @@ public class ByteArrayEntity extends Abs
/**
* @since 4.2
*/
+ @SuppressWarnings("deprecation")
public ByteArrayEntity(final byte[] b, final int off, final int len, final ContentType contentType) {
super();
Args.notNull(b, "Source byte array");