Author: markt
Date: Tue Sep 14 07:23:19 2010
New Revision: 996771
URL: http://svn.apache.org/viewvc?rev=996771&view=rev
Log:
Add @Override markers to package
Modified:
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/ChunkedOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.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/http11/filters/VoidOutputFilter.java
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
Tue Sep 14 07:23:19 2010
@@ -72,6 +72,7 @@ public class BufferedInputFilter impleme
/**
* Reads the request body and buffers it.
*/
+ @Override
public void setRequest(Request request) {
// save off the Request body
try {
@@ -87,6 +88,7 @@ public class BufferedInputFilter impleme
/**
* Fills the given ByteChunk with the buffered request body.
*/
+ @Override
public int doRead(ByteChunk chunk, Request request) throws IOException {
if (hasRead || buffered.getLength() <= 0) {
return -1;
@@ -98,10 +100,12 @@ public class BufferedInputFilter impleme
return chunk.getLength();
}
+ @Override
public void setBuffer(InputBuffer buffer) {
this.buffer = buffer;
}
+ @Override
public void recycle() {
if (buffered != null) {
if (buffered.getBuffer().length > 65536) {
@@ -115,14 +119,17 @@ public class BufferedInputFilter impleme
buffer = null;
}
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
+ @Override
public long end() throws IOException {
return 0;
}
+ @Override
public int available() {
return buffered.getLength();
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Tue Sep 14 07:23:19 2010
@@ -116,6 +116,7 @@ public class ChunkedInputFilter implemen
* whichever is greater. If the filter does not do request body length
* control, the returned value should be -1.
*/
+ @Override
public int doRead(ByteChunk chunk, Request req)
throws IOException {
@@ -174,6 +175,7 @@ public class ChunkedInputFilter implemen
/**
* Read the content length from the request.
*/
+ @Override
public void setRequest(Request request) {
// NOOP: Request isn't used so ignore it
}
@@ -182,6 +184,7 @@ public class ChunkedInputFilter implemen
/**
* End the current request.
*/
+ @Override
public long end()
throws IOException {
@@ -199,6 +202,7 @@ public class ChunkedInputFilter implemen
/**
* Amount of bytes still available in a buffer.
*/
+ @Override
public int available() {
return (lastValid - pos);
}
@@ -207,6 +211,7 @@ public class ChunkedInputFilter implemen
/**
* Set the next buffer in the filter pipeline.
*/
+ @Override
public void setBuffer(InputBuffer buffer) {
this.buffer = buffer;
}
@@ -215,6 +220,7 @@ public class ChunkedInputFilter implemen
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
remaining = 0;
pos = 0;
@@ -227,6 +233,7 @@ public class ChunkedInputFilter implemen
* Return the name of the associated encoding; Here, the value is
* "identity".
*/
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
Tue Sep 14 07:23:19 2010
@@ -102,6 +102,7 @@ public class ChunkedOutputFilter impleme
*
* @return number of bytes written by the filter
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
@@ -140,6 +141,7 @@ public class ChunkedOutputFilter impleme
* necessary reading can occur in that method, as this method is called
* after the response header processing is complete.
*/
+ @Override
public void setResponse(Response response) {
// NOOP: No need for parameters from response in this filter
}
@@ -148,6 +150,7 @@ public class ChunkedOutputFilter impleme
/**
* Set the next buffer in the filter pipeline.
*/
+ @Override
public void setBuffer(OutputBuffer buffer) {
this.buffer = buffer;
}
@@ -157,6 +160,7 @@ public class ChunkedOutputFilter impleme
* End the current request. It is acceptable to write extra bytes using
* buffer.doWrite during the execution of this method.
*/
+ @Override
public long end()
throws IOException {
@@ -171,6 +175,7 @@ public class ChunkedOutputFilter impleme
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
// NOOP: Nothing to recycle
}
@@ -180,6 +185,7 @@ public class ChunkedOutputFilter impleme
* Return the name of the associated encoding; Here, the value is
* "identity".
*/
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
Tue Sep 14 07:23:19 2010
@@ -85,6 +85,7 @@ public class GzipOutputFilter implements
*
* @return number of bytes written by the filter
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
if (compressionStream == null) {
@@ -121,6 +122,7 @@ public class GzipOutputFilter implements
* necessary reading can occur in that method, as this method is called
* after the response header processing is complete.
*/
+ @Override
public void setResponse(Response response) {
// NOOP: No need for parameters from response in this filter
}
@@ -129,6 +131,7 @@ public class GzipOutputFilter implements
/**
* Set the next buffer in the filter pipeline.
*/
+ @Override
public void setBuffer(OutputBuffer buffer) {
this.buffer = buffer;
}
@@ -138,6 +141,7 @@ public class GzipOutputFilter implements
* End the current request. It is acceptable to write extra bytes using
* buffer.doWrite during the execution of this method.
*/
+ @Override
public long end()
throws IOException {
if (compressionStream == null) {
@@ -152,6 +156,7 @@ public class GzipOutputFilter implements
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
// Set compression stream to null
compressionStream = null;
@@ -162,6 +167,7 @@ public class GzipOutputFilter implements
* Return the name of the associated encoding; Here, the value is
* "identity".
*/
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
Tue Sep 14 07:23:19 2010
@@ -105,6 +105,7 @@ public class IdentityInputFilter impleme
* whichever is greater. If the filter does not do request body length
* control, the returned value should be -1.
*/
+ @Override
public int doRead(ByteChunk chunk, Request req)
throws IOException {
@@ -143,6 +144,7 @@ public class IdentityInputFilter impleme
/**
* Read the content length from the request.
*/
+ @Override
public void setRequest(Request request) {
contentLength = request.getContentLengthLong();
remaining = contentLength;
@@ -152,6 +154,7 @@ public class IdentityInputFilter impleme
/**
* End the current request.
*/
+ @Override
public long end()
throws IOException {
@@ -174,6 +177,7 @@ public class IdentityInputFilter impleme
/**
* Amount of bytes still available in a buffer.
*/
+ @Override
public int available() {
return 0;
}
@@ -182,6 +186,7 @@ public class IdentityInputFilter impleme
/**
* Set the next buffer in the filter pipeline.
*/
+ @Override
public void setBuffer(InputBuffer buffer) {
this.buffer = buffer;
}
@@ -190,6 +195,7 @@ public class IdentityInputFilter impleme
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
contentLength = -1;
remaining = 0;
@@ -201,6 +207,7 @@ public class IdentityInputFilter impleme
* Return the name of the associated encoding; Here, the value is
* "identity".
*/
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
Tue Sep 14 07:23:19 2010
@@ -95,6 +95,7 @@ public class IdentityOutputFilter implem
*
* @return number of bytes written by the filter
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
@@ -140,6 +141,7 @@ public class IdentityOutputFilter implem
* necessary reading can occur in that method, as this method is called
* after the response header processing is complete.
*/
+ @Override
public void setResponse(Response response) {
contentLength = response.getContentLengthLong();
remaining = contentLength;
@@ -149,6 +151,7 @@ public class IdentityOutputFilter implem
/**
* Set the next buffer in the filter pipeline.
*/
+ @Override
public void setBuffer(OutputBuffer buffer) {
this.buffer = buffer;
}
@@ -158,6 +161,7 @@ public class IdentityOutputFilter implem
* End the current request. It is acceptable to write extra bytes using
* buffer.doWrite during the execution of this method.
*/
+ @Override
public long end()
throws IOException {
@@ -171,6 +175,7 @@ public class IdentityOutputFilter implem
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
contentLength = -1;
remaining = 0;
@@ -181,6 +186,7 @@ public class IdentityOutputFilter implem
* Return the name of the associated encoding; Here, the value is
* "identity".
*/
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
Tue Sep 14 07:23:19 2010
@@ -46,6 +46,7 @@ public class SavedRequestInputFilter imp
/**
* Read bytes.
*/
+ @Override
public int doRead(ByteChunk chunk, org.apache.coyote.Request request)
throws IOException {
int writeLength = 0;
@@ -69,6 +70,7 @@ public class SavedRequestInputFilter imp
/**
* Set the content length on the request.
*/
+ @Override
public void setRequest(org.apache.coyote.Request request) {
request.setContentLength(input.getLength());
}
@@ -76,6 +78,7 @@ public class SavedRequestInputFilter imp
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
input = null;
}
@@ -83,6 +86,7 @@ public class SavedRequestInputFilter imp
/**
* Return the name of the associated encoding; here, the value is null.
*/
+ @Override
public ByteChunk getEncodingName() {
return null;
}
@@ -90,6 +94,7 @@ public class SavedRequestInputFilter imp
/**
* Set the next buffer in the filter pipeline (has no effect).
*/
+ @Override
public void setBuffer(InputBuffer buffer) {
// NOOP since this filter will be providing the request body
}
@@ -97,6 +102,7 @@ public class SavedRequestInputFilter imp
/**
* Amount of bytes still available in a buffer.
*/
+ @Override
public int available() {
return input.getLength();
}
@@ -104,6 +110,7 @@ public class SavedRequestInputFilter imp
/**
* End the current request (has no effect).
*/
+ @Override
public long end() throws IOException {
return 0;
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java Tue
Sep 14 07:23:19 2010
@@ -59,6 +59,7 @@ public class VoidInputFilter implements
*
* @return number of bytes written by the filter
*/
+ @Override
public int doRead(ByteChunk chunk, Request req)
throws IOException {
@@ -73,6 +74,7 @@ public class VoidInputFilter implements
/**
* Set the associated request.
*/
+ @Override
public void setRequest(Request request) {
// NOOP: Request isn't used so ignore it
}
@@ -81,6 +83,7 @@ public class VoidInputFilter implements
/**
* Set the next buffer in the filter pipeline.
*/
+ @Override
public void setBuffer(InputBuffer buffer) {
// NOOP: No body to read
}
@@ -89,6 +92,7 @@ public class VoidInputFilter implements
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
// NOOP: Nothing to recycle
}
@@ -98,6 +102,7 @@ public class VoidInputFilter implements
* Return the name of the associated encoding; Here, the value is
* "void".
*/
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
@@ -112,6 +117,7 @@ public class VoidInputFilter implements
* missing bytes, which would indicate an error.
* Note: It is recommended that extra bytes be swallowed by the filter.
*/
+ @Override
public long end()
throws IOException {
return 0;
@@ -121,6 +127,7 @@ public class VoidInputFilter implements
/**
* Amount of bytes still available in a buffer.
*/
+ @Override
public int available() {
return 0;
}
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=996771&r1=996770&r2=996771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Tue Sep 14 07:23:19 2010
@@ -65,6 +65,7 @@ public class VoidOutputFilter implements
*
* @return number of bytes written by the filter
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
@@ -81,6 +82,7 @@ public class VoidOutputFilter implements
* necessary reading can occur in that method, as this method is called
* after the response header processing is complete.
*/
+ @Override
public void setResponse(Response response) {
// NOOP: No need for parameters from response in this filter
}
@@ -89,6 +91,7 @@ public class VoidOutputFilter implements
/**
* Set the next buffer in the filter pipeline.
*/
+ @Override
public void setBuffer(OutputBuffer buffer) {
this.buffer = buffer;
}
@@ -97,6 +100,7 @@ public class VoidOutputFilter implements
/**
* Make the filter ready to process the next request.
*/
+ @Override
public void recycle() {
// NOOP: Nothing to recycle
}
@@ -106,6 +110,7 @@ public class VoidOutputFilter implements
* Return the name of the associated encoding; Here, the value is
* "identity".
*/
+ @Override
public ByteChunk getEncodingName() {
return ENCODING;
}
@@ -120,6 +125,7 @@ public class VoidOutputFilter implements
* missing bytes, which would indicate an error.
* Note: It is recommended that extra bytes be swallowed by the filter.
*/
+ @Override
public long end()
throws IOException {
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
