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/11/30 10:19:55 UTC
svn commit: r1816695 - in /tomcat/trunk: java/org/apache/coyote/http11/
java/org/apache/coyote/http11/filters/ test/org/apache/coyote/http11/filters/
Author: markt
Date: Thu Nov 30 10:19:54 2017
New Revision: 1816695
URL: http://svn.apache.org/viewvc?rev=1816695&view=rev
Log:
Refactoring: HTTP/1.1 - HTTP/2 alignment
Introduce HttpOutputBuffer into class hierarchy
Added:
tomcat/trunk/java/org/apache/coyote/http11/HttpOutputBuffer.java (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.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/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
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=1816695&r1=1816694&r2=1816695&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Thu Nov 30 10:19:54 2017
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import java.util.Arrays;
import org.apache.coyote.ActionCode;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
import org.apache.coyote.http11.filters.GzipOutputFilter;
import org.apache.juli.logging.Log;
@@ -37,7 +36,7 @@ import org.apache.tomcat.util.res.String
* headers (once committed) and the response body. Note that buffering of the
* response body happens at a higher level.
*/
-public class Http11OutputBuffer implements OutputBuffer {
+public class Http11OutputBuffer implements HttpOutputBuffer {
// -------------------------------------------------------------- Variables
@@ -94,7 +93,7 @@ public class Http11OutputBuffer implemen
/**
* Underlying output buffer.
*/
- protected OutputBuffer outputStreamOutputBuffer;
+ protected HttpOutputBuffer outputStreamOutputBuffer;
/**
@@ -539,7 +538,7 @@ public class Http11OutputBuffer implemen
/**
* This class is an output buffer which will write data to a socket.
*/
- protected class SocketOutputBuffer implements OutputBuffer {
+ protected class SocketOutputBuffer implements HttpOutputBuffer {
/**
* Write chunk.
Added: tomcat/trunk/java/org/apache/coyote/http11/HttpOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/HttpOutputBuffer.java?rev=1816695&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/HttpOutputBuffer.java (added)
+++ tomcat/trunk/java/org/apache/coyote/http11/HttpOutputBuffer.java Thu Nov 30 10:19:54 2017
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.coyote.http11;
+
+import org.apache.coyote.OutputBuffer;
+
+public interface HttpOutputBuffer extends OutputBuffer {
+
+}
Propchange: tomcat/trunk/java/org/apache/coyote/http11/HttpOutputBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java?rev=1816695&r1=1816694&r2=1816695&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java Thu Nov 30 10:19:54 2017
@@ -18,7 +18,6 @@ package org.apache.coyote.http11;
import java.io.IOException;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
/**
@@ -26,7 +25,7 @@ import org.apache.coyote.Response;
*
* @author Remy Maucherat
*/
-public interface OutputFilter extends OutputBuffer {
+public interface OutputFilter extends HttpOutputBuffer {
/**
* Some filters need additional parameters from the response. All the
@@ -49,7 +48,7 @@ public interface OutputFilter extends Ou
*
* @param buffer The next buffer instance
*/
- public void setBuffer(OutputBuffer buffer);
+ public void setBuffer(HttpOutputBuffer buffer);
/**
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=1816695&r1=1816694&r2=1816695&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java Thu Nov 30 10:19:54 2017
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
+import org.apache.coyote.http11.HttpOutputBuffer;
import org.apache.coyote.http11.OutputFilter;
import org.apache.tomcat.util.buf.HexUtils;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
@@ -67,7 +67,7 @@ public class ChunkedOutputFilter impleme
/**
* Next buffer in the pipeline.
*/
- protected OutputBuffer buffer;
+ protected HttpOutputBuffer buffer;
/**
@@ -146,7 +146,7 @@ public class ChunkedOutputFilter impleme
@Override
- public void setBuffer(OutputBuffer buffer) {
+ public void setBuffer(HttpOutputBuffer buffer) {
this.buffer = buffer;
}
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=1816695&r1=1816694&r2=1816695&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java Thu Nov 30 10:19:54 2017
@@ -21,8 +21,8 @@ import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.zip.GZIPOutputStream;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
+import org.apache.coyote.http11.HttpOutputBuffer;
import org.apache.coyote.http11.OutputFilter;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -42,7 +42,7 @@ public class GzipOutputFilter implements
/**
* Next buffer in the pipeline.
*/
- protected OutputBuffer buffer;
+ protected HttpOutputBuffer buffer;
/**
@@ -110,7 +110,7 @@ public class GzipOutputFilter implements
@Override
- public void setBuffer(OutputBuffer buffer) {
+ public void setBuffer(HttpOutputBuffer buffer) {
this.buffer = buffer;
}
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=1816695&r1=1816694&r2=1816695&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java Thu Nov 30 10:19:54 2017
@@ -19,8 +19,8 @@ package org.apache.coyote.http11.filters
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
+import org.apache.coyote.http11.HttpOutputBuffer;
import org.apache.coyote.http11.OutputFilter;
/**
@@ -47,7 +47,7 @@ public class IdentityOutputFilter implem
/**
* Next buffer in the pipeline.
*/
- protected OutputBuffer buffer;
+ protected HttpOutputBuffer buffer;
// --------------------------------------------------- OutputBuffer Methods
@@ -106,7 +106,7 @@ public class IdentityOutputFilter implem
@Override
- public void setBuffer(OutputBuffer buffer) {
+ public void setBuffer(HttpOutputBuffer buffer) {
this.buffer = buffer;
}
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=1816695&r1=1816694&r2=1816695&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java Thu Nov 30 10:19:54 2017
@@ -19,8 +19,8 @@ package org.apache.coyote.http11.filters
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
+import org.apache.coyote.http11.HttpOutputBuffer;
import org.apache.coyote.http11.OutputFilter;
/**
@@ -54,7 +54,7 @@ public class VoidOutputFilter implements
@Override
- public void setBuffer(OutputBuffer buffer) {
+ public void setBuffer(HttpOutputBuffer buffer) {
// NO-OP
}
Modified: tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java?rev=1816695&r1=1816694&r2=1816695&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java Thu Nov 30 10:19:54 2017
@@ -20,9 +20,9 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
import org.apache.coyote.http11.Http11OutputBuffer;
+import org.apache.coyote.http11.HttpOutputBuffer;
import org.apache.tomcat.util.net.SocketWrapperBase;
/**
@@ -99,7 +99,7 @@ public class TesterOutputBuffer extends
* This class is an output buffer which will write data to an output
* stream.
*/
- protected class OutputStreamOutputBuffer implements OutputBuffer {
+ protected class OutputStreamOutputBuffer implements HttpOutputBuffer {
@Override
public int doWrite(ByteBuffer chunk) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org