Author: markt
Date: Thu Apr 9 12:33:37 2015
New Revision: 1672312
URL: http://svn.apache.org/r1672312
Log:
Remove unused parameter passed around a whole bunch of code.
Discovered while fixing Java 8 Javadoc issues with InputBuffer when I wondered
what the Request parameter was for. Answer: in this case, nothing!
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/InputFilter.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/spdy/SpdyProcessor.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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/InputBuffer.java Thu Apr 9 12:33:37
2015
@@ -14,30 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.coyote;
import java.io.IOException;
import org.apache.tomcat.util.buf.ByteChunk;
-
/**
- * Input buffer.
- *
- * This class is used only in the protocol implementation. All reading from
- * Tomcat ( or adapter ) should be done using Request.doRead().
+ * This class is only for internal use in the protocol implementation. All
+ * reading from Tomcat (or adapter) should be done using Request.doRead().
*/
public interface InputBuffer {
-
- /** Return from the input stream.
+ /**
+ * Read from the input
+ * Return from the input stream.
IMPORTANT: the current model assumes that the protocol will 'own' the
buffer and return a pointer to it in ByteChunk ( i.e. the param will
have chunk.getBytes()==null before call, and the result after the call
).
*/
- public int doRead(ByteChunk chunk, Request request)
- throws IOException;
-
-
+ 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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu Apr 9 12:33:37 2015
@@ -464,9 +464,8 @@ public final class Request {
* InputStream, this interface allows the app to process data in place,
without copy.
*
*/
- public int doRead(ByteChunk chunk)
- throws IOException {
- int n = inputBuffer.doRead(chunk, this);
+ public int doRead(ByteChunk chunk) throws IOException {
+ int n = inputBuffer.doRead(chunk);
if (n > 0) {
bytesRead+=n;
}
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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Apr 9
12:33:37 2015
@@ -37,7 +37,6 @@ import org.apache.coyote.AsyncContextCal
import org.apache.coyote.ErrorState;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.OutputBuffer;
-import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -1589,7 +1588,7 @@ public class AjpProcessor extends Abstra
* Read bytes into the specified chunk.
*/
@Override
- public int doRead(ByteChunk chunk, Request req) throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
if (endOfStream) {
return -1;
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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Thu Apr
9 12:33:37 2015
@@ -296,12 +296,12 @@ public class Http11InputBuffer implement
* Read some bytes.
*/
@Override
- public int doRead(ByteChunk chunk, Request req) throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
if (lastActiveFilter == -1)
- return inputStreamInputBuffer.doRead(chunk, req);
+ return inputStreamInputBuffer.doRead(chunk);
else
- return activeFilters[lastActiveFilter].doRead(chunk,req);
+ return activeFilters[lastActiveFilter].doRead(chunk);
}
@@ -1050,8 +1050,7 @@ public class Http11InputBuffer implement
* Read bytes into the specified chunk.
*/
@Override
- public int doRead(ByteChunk chunk, Request req )
- throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
if (pos >= lastValid) {
// The application is reading the HTTP request body which is
Modified: tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java?rev=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java Thu Apr 9
12:33:37 2015
@@ -37,8 +37,7 @@ public interface InputFilter extends Inp
* @return Number of bytes read.
*/
@Override
- public int doRead(ByteChunk chunk, Request unused)
- throws IOException;
+ 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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
Thu Apr 9 12:33:37 2015
@@ -80,7 +80,7 @@ public class BufferedInputFilter impleme
public void setRequest(Request request) {
// save off the Request body
try {
- while (buffer.doRead(tempRead, request) >= 0) {
+ while (buffer.doRead(tempRead) >= 0) {
buffered.append(tempRead);
tempRead.recycle();
}
@@ -95,7 +95,7 @@ public class BufferedInputFilter impleme
* Fills the given ByteChunk with the buffered request body.
*/
@Override
- public int doRead(ByteChunk chunk, Request request) throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
if (hasRead || buffered.getLength() <= 0) {
return -1;
}
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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Thu Apr 9 12:33:37 2015
@@ -174,7 +174,7 @@ public class ChunkedInputFilter implemen
* control, the returned value should be -1.
*/
@Override
- public int doRead(ByteChunk chunk, Request req) throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
if (endChunk) {
return -1;
}
@@ -247,7 +247,7 @@ public class ChunkedInputFilter implemen
long swallowed = 0;
int read = 0;
// Consume extra bytes : parse the stream until the end chunk is found
- while ((read = doRead(readChunk, null)) >= 0) {
+ while ((read = doRead(readChunk)) >= 0) {
swallowed += read;
if (maxSwallowSize > -1 && swallowed > maxSwallowSize) {
throwIOException(sm.getString("inputFilter.maxSwallow"));
@@ -317,7 +317,7 @@ public class ChunkedInputFilter implemen
*/
protected int readBytes() throws IOException {
- int nRead = buffer.doRead(readChunk, null);
+ int nRead = buffer.doRead(readChunk);
pos = readChunk.getStart();
lastValid = pos + nRead;
buf = readChunk.getBytes();
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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
Thu Apr 9 12:33:37 2015
@@ -100,14 +100,13 @@ public class IdentityInputFilter impleme
* control, the returned value should be -1.
*/
@Override
- public int doRead(ByteChunk chunk, Request req)
- throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
int result = -1;
if (contentLength >= 0) {
if (remaining > 0) {
- int nRead = buffer.doRead(chunk, req);
+ int nRead = buffer.doRead(chunk);
if (nRead > remaining) {
// The chunk is longer than the number of bytes remaining
// in the body; changing the chunk length to the number
@@ -156,7 +155,7 @@ public class IdentityInputFilter impleme
// Consume extra bytes.
while (remaining > 0) {
- int nread = buffer.doRead(endChunk, null);
+ int nread = buffer.doRead(endChunk);
if (nread > 0 ) {
swallowed += nread;
remaining = remaining - nread;
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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
Thu Apr 9 12:33:37 2015
@@ -47,8 +47,7 @@ public class SavedRequestInputFilter imp
* Read bytes.
*/
@Override
- public int doRead(ByteChunk chunk, org.apache.coyote.Request request)
- throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
if(input.getOffset()>= input.getEnd())
return -1;
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=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java Thu
Apr 9 12:33:37 2015
@@ -55,7 +55,7 @@ public class VoidInputFilter implements
* @return number of bytes written by the filter
*/
@Override
- public int doRead(ByteChunk chunk, Request req) throws IOException {
+ public int doRead(ByteChunk chunk) throws IOException {
return -1;
}
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1672312&r1=1672311&r2=1672312&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Thu Apr 9
12:33:37 2015
@@ -31,7 +31,6 @@ import org.apache.coyote.AsyncContextCal
import org.apache.coyote.ErrorState;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.OutputBuffer;
-import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -93,7 +92,7 @@ public class SpdyProcessor extends Abstr
class LiteInputBuffer implements InputBuffer {
@Override
- public int doRead(ByteChunk bchunk, Request request) throws
IOException {
+ public int doRead(ByteChunk bchunk) throws IOException {
if (inFrame == null) {
// blocking
inFrame = spdyStream.getDataFrame(endpoint.getSoTimeout());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
