Rename

Author: JamesNK

src/Servers/Kestrel/Core/test/Http2HPackEncoderTests.cs

@@ -452,7 +452,7 @@ private static Http2HeadersEnumerator GetHeadersEnumerator(IEnumerable<KeyValueP
             return enumerator;
         }
 
-        private HPackHeaderEntry GetHeaderEntry(HPackEncoder encoder, int index)
+        private EncoderHeaderEntry GetHeaderEntry(HPackEncoder encoder, int index)
         {
             var entry = encoder.Head;
             while (index-- >= 0)
@@ -462,9 +462,9 @@ private HPackHeaderEntry GetHeaderEntry(HPackEncoder encoder, int index)
             return entry;
         }
 
-        private List<HPackHeaderEntry> GetHeaderEntries(HPackEncoder encoder)
+        private List<EncoderHeaderEntry> GetHeaderEntries(HPackEncoder encoder)
         {
-            var headers = new List<HPackHeaderEntry>();
+            var headers = new List<EncoderHeaderEntry>();
 
             var entry = encoder.Head;
             while (entry.Before != encoder.Head)

src/Shared/runtime/Http2/Hpack/HPackHeaderEntry.cs renamed to src/Shared/runtime/Http2/Hpack/EncoderHeaderEntry.cs

@@ -7,27 +7,27 @@
 namespace System.Net.Http.HPack
 {
     [DebuggerDisplay("Name = {Name} Value = {Value}")]
-    internal class HPackHeaderEntry
+    internal class EncoderHeaderEntry
     {
         // Header name and value
         public string Name;
         public string Value;
 
         // Chained list of headers in the same bucket
-        public HPackHeaderEntry Next;
+        public EncoderHeaderEntry Next;
         public int Hash;
 
         // Compute dynamic table index
         public int Index;
 
         // Doubly linked list
-        public HPackHeaderEntry Before;
-        public HPackHeaderEntry After;
+        public EncoderHeaderEntry Before;
+        public EncoderHeaderEntry After;
 
         /// <summary>
         /// Initialize header values. An entry will be reinitialized when reused.
         /// </summary>
-        public void Initialize(int hash, string name, string value, int index, HPackHeaderEntry next)
+        public void Initialize(int hash, string name, string value, int index, EncoderHeaderEntry next)
         {
             Debug.Assert(name != null);
             Debug.Assert(value != null);
@@ -62,7 +62,7 @@ public void Remove()
         /// <summary>
         /// Add before an entry in the linked list.
         /// </summary>
-        public void AddBefore(HPackHeaderEntry existingEntry)
+        public void AddBefore(EncoderHeaderEntry existingEntry)
         {
             After = existingEntry;
             Before = existingEntry.Before;

src/Shared/runtime/Http2/Hpack/HPackEncoder.Dynamic.cs

@@ -13,25 +13,25 @@ internal partial class HPackEncoder
         public const int DefaultHeaderTableSize = 4096;
 
         // Internal for testing
-        internal readonly HPackHeaderEntry Head;
+        internal readonly EncoderHeaderEntry Head;
 
         private readonly bool _disableDynamicCompression;
-        private readonly HPackHeaderEntry[] _headerBuckets;
+        private readonly EncoderHeaderEntry[] _headerBuckets;
         private readonly byte _hashMask;
         private uint _headerTableSize;
         private uint _maxHeaderTableSize;
         private bool _pendingTableSizeUpdate;
-        private HPackHeaderEntry? _removed;
+        private EncoderHeaderEntry? _removed;
 
         public HPackEncoder(bool disableDynamicCompression = false, uint maxHeaderTableSize = DefaultHeaderTableSize)
         {
             _disableDynamicCompression = disableDynamicCompression;
             _maxHeaderTableSize = maxHeaderTableSize;
-            Head = new HPackHeaderEntry();
+            Head = new EncoderHeaderEntry();
             Head.Initialize(-1, string.Empty, string.Empty, int.MaxValue, null);
             // Bucket count balances memory usage and the expected low number of headers (constrained by the header table size).
             // Performance with different bucket counts hasn't been measured in detail.
-            _headerBuckets = new HPackHeaderEntry[16];
+            _headerBuckets = new EncoderHeaderEntry[16];
             _hashMask = (byte)(_headerBuckets.Length - 1);
             Head.Before = Head.After = Head;
         }
@@ -155,7 +155,7 @@ private void EnsureCapacity(uint headerSize)
             }
         }
 
-        private HPackHeaderEntry? GetEntry(string name, string value)
+        private EncoderHeaderEntry? GetEntry(string name, string value)
         {
             if (_headerTableSize == 0)
             {
@@ -209,14 +209,14 @@ private void AddHeaderEntry(string name, string value, uint headerSize)
             var bucketIndex = CalculateBucketIndex(hash);
             var oldEntry = _headerBuckets[bucketIndex];
             // Attempt to reuse removed entry
-            var newEntry = PopRemovedEntry() ?? new HPackHeaderEntry();
+            var newEntry = PopRemovedEntry() ?? new EncoderHeaderEntry();
             newEntry.Initialize(hash, name, value, Head.Before.Index - 1, oldEntry);
             _headerBuckets[bucketIndex] = newEntry;
             newEntry.AddBefore(Head);
             _headerTableSize += headerSize;
         }
 
-        private void PushRemovedEntry(HPackHeaderEntry removed)
+        private void PushRemovedEntry(EncoderHeaderEntry removed)
         {
             if (_removed != null)
             {
@@ -225,7 +225,7 @@ private void PushRemovedEntry(HPackHeaderEntry removed)
             _removed = removed;
         }
 
-        private HPackHeaderEntry? PopRemovedEntry()
+        private EncoderHeaderEntry? PopRemovedEntry()
         {
             if (_removed != null)
             {
@@ -240,7 +240,7 @@ private void PushRemovedEntry(HPackHeaderEntry removed)
         /// <summary>
         /// Remove the oldest entry.
         /// </summary>
-        private HPackHeaderEntry? RemoveHeaderEntry()
+        private EncoderHeaderEntry? RemoveHeaderEntry()
         {
             if (_headerTableSize == 0)
             {
@@ -253,7 +253,7 @@ private void PushRemovedEntry(HPackHeaderEntry removed)
             var e = prev;
             while (e != null)
             {
-                HPackHeaderEntry next = e.Next;
+                EncoderHeaderEntry next = e.Next;
                 if (e == eldest)
                 {
                     if (prev == eldest)