andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HpackDecoder#addHeader has an unused parameter

Browse Source 
Motivation:
HpackDecoder#addHeader takes in the streamId as a parameter but no longer uses it.

Modifications:
- Remove the streamId parameter from HpackDecoder#addHeader

Result:
Less unused parameters in HpackDecoder.
This commit is contained in:
Scott Mitchell 2017-12-21 17:45:13 -08:00 committed by Norman Maurer
parent e004b4a354
commit 336cee9b1f
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java
View File

@ -146,7 +146,7 @@ final class HpackDecoder {
state = READ_INDEXED_HEADER; state = READ_INDEXED_HEADER;
break; break;
default: default:
headersLength = indexHeader(streamId, index, headers, headersLength); headersLength = indexHeader(index, headers, headersLength);
} }
} else if ((b & 0x40) == 0x40) { } else if ((b & 0x40) == 0x40) {
// Literal Header Field with Incremental Indexing // Literal Header Field with Incremental Indexing
@ -200,7 +200,7 @@ final class HpackDecoder {
break; break;
case READ_INDEXED_HEADER: case READ_INDEXED_HEADER:
headersLength = indexHeader(streamId, decodeULE128(in, index), headers, headersLength); headersLength = indexHeader(decodeULE128(in, index), headers, headersLength);
state = READ_HEADER_REPRESENTATION; state = READ_HEADER_REPRESENTATION;
break; break;
@ -256,8 +256,7 @@ final class HpackDecoder {
state = READ_LITERAL_HEADER_VALUE_LENGTH; state = READ_LITERAL_HEADER_VALUE_LENGTH;
break; break;
case 0: case 0:
headersLength = insertHeader(streamId, headers, name, EMPTY_STRING, indexType, headersLength = insertHeader(headers, name, EMPTY_STRING, indexType, headersLength);
headersLength);
state = READ_HEADER_REPRESENTATION; state = READ_HEADER_REPRESENTATION;
break; break;
default: default:
@ -289,7 +288,7 @@ final class HpackDecoder {
} }
CharSequence value = readStringLiteral(in, valueLength, huffmanEncoded); CharSequence value = readStringLiteral(in, valueLength, huffmanEncoded);
headersLength = insertHeader(streamId, headers, name, value, indexType, headersLength); headersLength = insertHeader(headers, name, value, indexType, headersLength);
state = READ_HEADER_REPRESENTATION; state = READ_HEADER_REPRESENTATION;
break; break;
@ -395,21 +394,21 @@ final class HpackDecoder {
throw READ_NAME_ILLEGAL_INDEX_VALUE; throw READ_NAME_ILLEGAL_INDEX_VALUE;
} }
private long indexHeader(int streamId, int index, Http2Headers headers, long headersLength) throws Http2Exception { private long indexHeader(int index, Http2Headers headers, long headersLength) throws Http2Exception {
if (index <= HpackStaticTable.length) { if (index <= HpackStaticTable.length) {
HpackHeaderField hpackHeaderField = HpackStaticTable.getEntry(index); HpackHeaderField hpackHeaderField = HpackStaticTable.getEntry(index);
return addHeader(streamId, headers, hpackHeaderField.name, hpackHeaderField.value, headersLength); return addHeader(headers, hpackHeaderField.name, hpackHeaderField.value, headersLength);
} }
if (index - HpackStaticTable.length <= hpackDynamicTable.length()) { if (index - HpackStaticTable.length <= hpackDynamicTable.length()) {
HpackHeaderField hpackHeaderField = hpackDynamicTable.getEntry(index - HpackStaticTable.length); HpackHeaderField hpackHeaderField = hpackDynamicTable.getEntry(index - HpackStaticTable.length);
return addHeader(streamId, headers, hpackHeaderField.name, hpackHeaderField.value, headersLength); return addHeader(headers, hpackHeaderField.name, hpackHeaderField.value, headersLength);
} }
throw INDEX_HEADER_ILLEGAL_INDEX_VALUE; throw INDEX_HEADER_ILLEGAL_INDEX_VALUE;
} }
private long insertHeader(int streamId, Http2Headers headers, CharSequence name, CharSequence value, private long insertHeader(Http2Headers headers, CharSequence name, CharSequence value,
IndexType indexType, long headerSize) throws Http2Exception { IndexType indexType, long headerSize) throws Http2Exception {
headerSize = addHeader(streamId, headers, name, value, headerSize); headerSize = addHeader(headers, name, value, headerSize);
switch (indexType) { switch (indexType) {
case NONE: case NONE:
@ -427,8 +426,8 @@ final class HpackDecoder {
return headerSize; return headerSize;
} }
private long addHeader(int streamId, Http2Headers headers, CharSequence name, CharSequence value, private long addHeader(Http2Headers headers, CharSequence name, CharSequence value, long headersLength)
long headersLength) throws Http2Exception { throws Http2Exception {
headersLength += HpackHeaderField.sizeOf(name, value); headersLength += HpackHeaderField.sizeOf(name, value);
if (headersLength > maxHeaderListSizeGoAway) { if (headersLength > maxHeaderListSizeGoAway) {
headerListSizeExceeded(maxHeaderListSizeGoAway); headerListSizeExceeded(maxHeaderListSizeGoAway);