Author: violetagg
Date: Thu Oct 6 12:02:46 2016
New Revision: 1763568
URL: http://svn.apache.org/viewvc?rev=1763568&view=rev
Log:
Deprecate unused code.
Modified:
tomcat/trunk/java/org/apache/coyote/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/InputBuffer.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/InputBuffer.java Thu Oct 6 12:02:46
2016
@@ -39,6 +39,9 @@ public interface InputBuffer {
* end of stream
*
* @throws IOException If an I/O error occurs reading from the input stream
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
*/
public int doRead(ByteChunk chunk) throws IOException;
Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu Oct 6 12:02:46 2016
@@ -507,6 +507,9 @@ public final class Request {
* @return The number of bytes copied
*
* @throws IOException If an I/O error occurs during the copy
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
*/
public int doRead(ByteChunk chunk) throws IOException {
int n = inputBuffer.doRead(chunk);
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Oct 6
12:02:46 2016
@@ -1352,6 +1352,10 @@ public class AjpProcessor extends Abstra
*/
protected class SocketInputBuffer implements InputBuffer {
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Thu Oct
6 12:02:46 2016
@@ -282,6 +282,10 @@ public class Http11InputBuffer implement
// ---------------------------------------------------- InputBuffer Methods
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
@@ -1067,6 +1071,11 @@ public class Http11InputBuffer implement
*/
private class SocketInputBuffer implements InputBuffer {
+ /**
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
Thu Oct 6 12:02:46 2016
@@ -98,6 +98,9 @@ public class BufferedInputFilter impleme
/**
* Fills the given ByteChunk with the buffered request body.
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
*/
@Override
public int doRead(ByteChunk chunk) throws IOException {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Thu Oct 6 12:02:46 2016
@@ -148,6 +148,10 @@ public class ChunkedInputFilter implemen
// ---------------------------------------------------- InputBuffer Methods
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
if (endChunk) {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
Thu Oct 6 12:02:46 2016
@@ -92,6 +92,10 @@ public class IdentityInputFilter impleme
// ---------------------------------------------------- InputBuffer Methods
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
Thu Oct 6 12:02:46 2016
@@ -45,6 +45,10 @@ public class SavedRequestInputFilter imp
this.input = input;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
if(input.getOffset()>= input.getEnd())
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java Thu
Oct 6 12:02:46 2016
@@ -50,6 +50,10 @@ public class VoidInputFilter implements
// ---------------------------------------------------- InputBuffer Methods
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
return -1;
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 6 12:02:46
2016
@@ -605,6 +605,10 @@ public class Stream extends AbstractStre
private volatile boolean readInterest;
private boolean reset = false;
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
@Override
public int doRead(ByteChunk chunk) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
