Author: violetagg Date: Sun Sep 25 14:37:10 2016 New Revision: 1762208 URL: http://svn.apache.org/viewvc?rev=1762208&view=rev Log: Deprecate unused code.
Modified: tomcat/trunk/java/org/apache/coyote/OutputBuffer.java tomcat/trunk/java/org/apache/coyote/Response.java tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java tomcat/trunk/java/org/apache/coyote/http2/Stream.java Modified: tomcat/trunk/java/org/apache/coyote/OutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/OutputBuffer.java?rev=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/OutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/OutputBuffer.java Sun Sep 25 14:37:10 2016 @@ -40,6 +40,9 @@ public interface OutputBuffer { * the input chunk * * @throws IOException an underlying I/O error occurred + * + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} */ public int doWrite(ByteChunk chunk) throws IOException; Modified: tomcat/trunk/java/org/apache/coyote/Response.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/Response.java (original) +++ tomcat/trunk/java/org/apache/coyote/Response.java Sun Sep 25 14:37:10 2016 @@ -495,6 +495,9 @@ public final class Response { * @param chunk The bytes to write * * @throws IOException If an I/O error occurs during the write + * + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} */ public void doWrite(ByteChunk chunk) throws IOException { outputBuffer.doWrite(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=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sun Sep 25 14:37:10 2016 @@ -1306,6 +1306,10 @@ public class AjpProcessor extends Abstra } + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ private void writeData(ByteChunk chunk) throws IOException { boolean blocking = (response.getWriteListener() == null); @@ -1403,6 +1407,10 @@ public class AjpProcessor extends Abstra */ protected class SocketOutputBuffer implements OutputBuffer { + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ @Override public int doWrite(ByteChunk chunk) throws IOException { Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Sun Sep 25 14:37:10 2016 @@ -191,6 +191,10 @@ public class Http11OutputBuffer implemen // --------------------------------------------------- OutputBuffer Methods + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ @Override public int doWrite(ByteChunk chunk) throws IOException { @@ -571,6 +575,9 @@ public class Http11OutputBuffer implemen /** * Write chunk. + * + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} */ @Override public int doWrite(ByteChunk chunk) throws IOException { Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java Sun Sep 25 14:37:10 2016 @@ -77,6 +77,10 @@ public class ChunkedOutputFilter impleme // --------------------------------------------------- OutputBuffer Methods + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ @Override public int doWrite(ByteChunk chunk) throws IOException { Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java Sun Sep 25 14:37:10 2016 @@ -63,6 +63,10 @@ public class GzipOutputFilter implements // --------------------------------------------------- OutputBuffer Methods + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ @Override public int doWrite(ByteChunk chunk) throws IOException { if (compressionStream == null) { Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java?rev=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java Sun Sep 25 14:37:10 2016 @@ -56,6 +56,10 @@ public class IdentityOutputFilter implem // --------------------------------------------------- OutputBuffer Methods + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ @Override public int doWrite(ByteChunk chunk) throws IOException { Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java?rev=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java Sun Sep 25 14:37:10 2016 @@ -36,6 +36,10 @@ public class VoidOutputFilter implements // --------------------------------------------------- OutputBuffer Methods + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ @Override public int doWrite(ByteChunk chunk) throws IOException { return chunk.getLength(); 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=1762208&r1=1762207&r2=1762208&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Sun Sep 25 14:37:10 2016 @@ -461,6 +461,10 @@ public class Stream extends AbstractStre * client that performed concurrent writes could corrupt the buffer. */ + /** + * @deprecated Unused. Will be removed in Tomcat 9. Use + * {@link #doWrite(ByteBuffer)} + */ @Override public synchronized int doWrite(ByteChunk chunk) throws IOException { if (closed) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org