You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/02/03 21:07:30 UTC
svn commit: r1781599 - in /tomcat/tc8.5.x/trunk/java/org/apache/coyote: ./
ajp/ http11/ http11/filters/
Author: markt
Date: Fri Feb 3 21:07:30 2017
New Revision: 1781599
URL: http://svn.apache.org/viewvc?rev=1781599&view=rev
Log:
Add missing deprecation annotations
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java Fri Feb 3 21:07:30 2017
@@ -43,6 +43,7 @@ public interface InputBuffer {
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
public int doRead(ByteChunk chunk) throws IOException;
/**
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java Fri Feb 3 21:07:30 2017
@@ -44,6 +44,7 @@ public interface OutputBuffer {
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
public int doWrite(ByteChunk chunk) throws IOException;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/Request.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/Request.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/Request.java Fri Feb 3 21:07:30 2017
@@ -511,6 +511,7 @@ public final class Request {
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
public int doRead(ByteChunk chunk) throws IOException {
int n = inputBuffer.doRead(chunk);
if (n > 0) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java Fri Feb 3 21:07:30 2017
@@ -499,6 +499,7 @@ public final class Response {
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
public void doWrite(ByteChunk chunk) throws IOException {
outputBuffer.doWrite(chunk);
contentWritten+=chunk.getLength();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Feb 3 21:07:30 2017
@@ -1304,6 +1304,7 @@ public class AjpProcessor extends Abstra
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
private void writeData(ByteChunk chunk) throws IOException {
boolean blocking = (response.getWriteListener() == null);
@@ -1378,6 +1379,7 @@ public class AjpProcessor extends Abstra
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
@@ -1426,6 +1428,7 @@ public class AjpProcessor extends Abstra
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
@Override
public int doWrite(ByteChunk chunk) throws IOException {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Fri Feb 3 21:07:30 2017
@@ -237,6 +237,7 @@ public class Http11InputBuffer implement
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
@@ -1035,6 +1036,7 @@ public class Http11InputBuffer implement
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Fri Feb 3 21:07:30 2017
@@ -189,6 +189,7 @@ public class Http11OutputBuffer implemen
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
@Override
public int doWrite(ByteChunk chunk) throws IOException {
@@ -561,6 +562,7 @@ public class Http11OutputBuffer implemen
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
@Override
public int doWrite(ByteChunk chunk) throws IOException {
int len = chunk.getLength();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java Fri Feb 3 21:07:30 2017
@@ -102,6 +102,7 @@ public class BufferedInputFilter impleme
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
if (isFinished()) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java Fri Feb 3 21:07:30 2017
@@ -81,6 +81,7 @@ public class ChunkedOutputFilter impleme
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
@Override
public int doWrite(ByteChunk chunk) throws IOException {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java Fri Feb 3 21:07:30 2017
@@ -67,6 +67,7 @@ public class GzipOutputFilter implements
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
@Override
public int doWrite(ByteChunk chunk) throws IOException {
if (compressionStream == null) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java Fri Feb 3 21:07:30 2017
@@ -96,6 +96,7 @@ public class IdentityInputFilter impleme
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java Fri Feb 3 21:07:30 2017
@@ -60,6 +60,7 @@ public class IdentityOutputFilter implem
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
@Override
public int doWrite(ByteChunk chunk) throws IOException {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java Fri Feb 3 21:07:30 2017
@@ -49,6 +49,7 @@ public class SavedRequestInputFilter imp
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
if(input.getOffset()>= input.getEnd())
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java Fri Feb 3 21:07:30 2017
@@ -54,6 +54,7 @@ public class VoidInputFilter implements
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+ @Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
return -1;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java?rev=1781599&r1=1781598&r2=1781599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java Fri Feb 3 21:07:30 2017
@@ -40,6 +40,7 @@ public class VoidOutputFilter implements
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doWrite(ByteBuffer)}
*/
+ @Deprecated
@Override
public int doWrite(ByteChunk chunk) throws IOException {
return chunk.getLength();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org