From 336cee9b1f431b5b3d5539984a391409ff2d9917 Mon Sep 17 00:00:00 2001
From: Scott Mitchell <scott_mitchell@apple.com>
Date: Thu, 21 Dec 2017 17:45:13 -0800
Subject: [PATCH] HpackDecoder#addHeader has an unused parameter

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.
---
 .../handler/codec/http2/HpackDecoder.java     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java
index ca7610816d..a34bd3eb79 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java
@@ -146,7 +146,7 @@ final class HpackDecoder {
                                 state = READ_INDEXED_HEADER;
                                 break;
                             default:
-                                headersLength = indexHeader(streamId, index, headers, headersLength);
+                                headersLength = indexHeader(index, headers, headersLength);
                         }
                     } else if ((b & 0x40) == 0x40) {
                         // Literal Header Field with Incremental Indexing
@@ -200,7 +200,7 @@ final class HpackDecoder {
                     break;
 
                 case READ_INDEXED_HEADER:
-                    headersLength = indexHeader(streamId, decodeULE128(in, index), headers, headersLength);
+                    headersLength = indexHeader(decodeULE128(in, index), headers, headersLength);
                     state = READ_HEADER_REPRESENTATION;
                     break;
 
@@ -256,8 +256,7 @@ final class HpackDecoder {
                             state = READ_LITERAL_HEADER_VALUE_LENGTH;
                             break;
                         case 0:
-                            headersLength = insertHeader(streamId, headers, name, EMPTY_STRING, indexType,
-                                                         headersLength);
+                            headersLength = insertHeader(headers, name, EMPTY_STRING, indexType, headersLength);
                             state = READ_HEADER_REPRESENTATION;
                             break;
                         default:
@@ -289,7 +288,7 @@ final class HpackDecoder {
                     }
 
                     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;
                     break;
 
@@ -395,21 +394,21 @@ final class HpackDecoder {
         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) {
             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()) {
             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;
     }
 
-    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 {
-        headerSize = addHeader(streamId, headers, name, value, headerSize);
+        headerSize = addHeader(headers, name, value, headerSize);
 
         switch (indexType) {
             case NONE:
@@ -427,8 +426,8 @@ final class HpackDecoder {
         return headerSize;
     }
 
-    private long addHeader(int streamId, Http2Headers headers, CharSequence name, CharSequence value,
-                           long headersLength) throws Http2Exception {
+    private long addHeader(Http2Headers headers, CharSequence name, CharSequence value, long headersLength)
+            throws Http2Exception {
         headersLength += HpackHeaderField.sizeOf(name, value);
         if (headersLength > maxHeaderListSizeGoAway) {
             headerListSizeExceeded(maxHeaderListSizeGoAway);