Author: markt Date: Thu Oct 13 09:55:19 2016 New Revision: 1764643 URL: http://svn.apache.org/viewvc?rev=1764643&view=rev Log: Remove unused code
Modified: tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java tomcat/trunk/java/org/apache/coyote/http2/Stream.java tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java?rev=1764643&r1=1764642&r2=1764643&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java Thu Oct 13 09:55:19 2016 @@ -26,7 +26,7 @@ import org.apache.coyote.http2.HpackDeco class HeaderSink implements HeaderEmitter { @Override - public void emitHeader(String name, String value, boolean neverIndex) { + public void emitHeader(String name, String value) { // NO-OP } } Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java?rev=1764643&r1=1764642&r2=1764643&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java Thu Oct 13 09:55:19 2016 @@ -109,7 +109,7 @@ public class HpackDecoder { buffer.position(originalPos); return; } - headerEmitter.emitHeader(headerName, headerValue, false); + headerEmitter.emitHeader(headerName, headerValue); addEntryToHeaderTable(new Hpack.HeaderField(headerName, headerValue)); } else if ((b & 0b11110000) == 0) { //Literal Header Field without Indexing @@ -123,7 +123,7 @@ public class HpackDecoder { buffer.position(originalPos); return; } - headerEmitter.emitHeader(headerName, headerValue, false); + headerEmitter.emitHeader(headerName, headerValue); } else if ((b & 0b11110000) == 0b00010000) { //Literal Header Field never indexed String headerName = readHeaderName(buffer, 4); @@ -136,7 +136,7 @@ public class HpackDecoder { buffer.position(originalPos); return; } - headerEmitter.emitHeader(headerName, headerValue, true); + headerEmitter.emitHeader(headerName, headerValue); } else if ((b & 0b11100000) == 0b00100000) { //context update max table size change if (!handleMaxMemorySizeChange(buffer, originalPos)) { @@ -246,7 +246,7 @@ public class HpackDecoder { } else { int adjustedIndex = getRealIndex(index - Hpack.STATIC_TABLE_LENGTH); Hpack.HeaderField headerField = headerTable[adjustedIndex]; - headerEmitter.emitHeader(headerField.name, headerField.value, false); + headerEmitter.emitHeader(headerField.name, headerField.value); } } @@ -273,7 +273,7 @@ public class HpackDecoder { if (entry.value == null) { throw new HpackException(); } - headerEmitter.emitHeader(entry.name, entry.value, false); + headerEmitter.emitHeader(entry.name, entry.value); } private void addEntryToHeaderTable(Hpack.HeaderField entry) { @@ -327,7 +327,7 @@ public class HpackDecoder { * Interface that can be used to immediately validate headers (ex: uppercase detection). */ interface HeaderEmitter { - void emitHeader(String name, String value, boolean neverIndex); + void emitHeader(String name, String value); } 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=1764643&r1=1764642&r2=1764643&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 13 09:55:19 2016 @@ -189,7 +189,7 @@ class Stream extends AbstractStream impl @Override - public final void emitHeader(String name, String value, boolean neverIndex) { + public final void emitHeader(String name, String value) { if (log.isDebugEnabled()) { log.debug(sm.getString("stream.header.debug", getConnectionId(), getIdentifier(), name, value)); Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1764643&r1=1764642&r2=1764643&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original) +++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Thu Oct 13 09:55:19 2016 @@ -791,7 +791,7 @@ public abstract class Http2TestBase exte @Override - public void emitHeader(String name, String value, boolean neverIndex) { + public void emitHeader(String name, String value) { // Date headers will always change so use a hard-coded default if ("date".equals(name)) { value = DEFAULT_DATE; Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java?rev=1764643&r1=1764642&r2=1764643&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java (original) +++ tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java Thu Oct 13 09:55:19 2016 @@ -76,7 +76,7 @@ public class TestHpack { this.headers = headers; } @Override - public void emitHeader(String name, String value, boolean neverIndex) { + public void emitHeader(String name, String value) { headers.setValue(name).setString(value); } } Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1764643&r1=1764642&r2=1764643&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 13 09:55:19 2016 @@ -70,13 +70,17 @@ </fix> </changelog> </subsection> - <subsection name="HTTP/2"> + <subsection name="Coyote"> <changelog> <fix> Correct the HPACK header table size configuration that transposed the client and server table sizes when creating the encoder and decoder. (markt) </fix> + <scode> + Review HTTP/2 implementation removing unused code, reducing visibility + where possible and using final where appropriate. (markt) + </scode> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org