Commit aa73a879 authored by Honfika's avatar Honfika

private method name fix + resharper rule + change develtop to master in pull request temple

parent 775c3481
Doneness: Doneness:
- [ ] Build is okay - I made sure that this change is building successfully. - [ ] Build is okay - I made sure that this change is building successfully.
- [ ] No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of. - [ ] No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of.
- [ ] Branching - If this is not a hotfix, I am making this request against develop branch - [ ] Branching - If this is not a hotfix, I am making this request against master branch
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4ab2e69_002D4d9c_002D4345_002Dbcd1_002D5541dacf5d38/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="Method (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=dda2ffa1_002D435c_002D4111_002D88eb_002D1a7c93c382f0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="Property (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=dda2ffa1_002D435c_002D4111_002D88eb_002D1a7c93c382f0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="Property (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
......
...@@ -173,7 +173,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -173,7 +173,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
break; break;
case State.ReadMaxDynamicTableSize: case State.ReadMaxDynamicTableSize:
int maxSize = DecodeULE128(input); int maxSize = decodeULE128(input);
if (maxSize == -1) if (maxSize == -1)
{ {
return; return;
...@@ -190,7 +190,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -190,7 +190,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
break; break;
case State.ReadIndexedHeader: case State.ReadIndexedHeader:
int headerIndex = DecodeULE128(input); int headerIndex = decodeULE128(input);
if (headerIndex == -1) if (headerIndex == -1)
{ {
return; return;
...@@ -208,7 +208,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -208,7 +208,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
case State.ReadIndexedHeaderName: case State.ReadIndexedHeaderName:
// Header Name matches an entry in the Header Table // Header Name matches an entry in the Header Table
int nameIndex = DecodeULE128(input); int nameIndex = decodeULE128(input);
if (nameIndex == -1) if (nameIndex == -1)
{ {
return; return;
...@@ -272,7 +272,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -272,7 +272,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
case State.ReadLiteralHeaderNameLength: case State.ReadLiteralHeaderNameLength:
// Header Name is a Literal String // Header Name is a Literal String
nameLength = DecodeULE128(input); nameLength = decodeULE128(input);
if (nameLength == -1) if (nameLength == -1)
{ {
return; return;
...@@ -388,7 +388,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -388,7 +388,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
case State.ReadLiteralHeaderValueLength: case State.ReadLiteralHeaderValueLength:
// Header Value is a Literal String // Header Value is a Literal String
valueLength = DecodeULE128(input); valueLength = decodeULE128(input);
if (valueLength == -1) if (valueLength == -1)
{ {
return; return;
...@@ -612,7 +612,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -612,7 +612,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
} }
// Unsigned Little Endian Base 128 Variable-Length Integer Encoding // Unsigned Little Endian Base 128 Variable-Length Integer Encoding
private static int DecodeULE128(BinaryReader input) private static int decodeULE128(BinaryReader input)
{ {
long markedPosition = input.BaseStream.Position; long markedPosition = input.BaseStream.Position;
int result = 0; int result = 0;
......
...@@ -66,8 +66,8 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -66,8 +66,8 @@ namespace Titanium.Web.Proxy.Http2.Hpack
// If the header value is sensitive then it must never be indexed // If the header value is sensitive then it must never be indexed
if (sensitive) if (sensitive)
{ {
int nameIndex = GetNameIndex(name); int nameIndex = getNameIndex(name);
EncodeLiteral(output, name, value, HpackUtil.IndexType.Never, nameIndex); encodeLiteral(output, name, value, HpackUtil.IndexType.Never, nameIndex);
return; return;
} }
...@@ -78,11 +78,11 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -78,11 +78,11 @@ namespace Titanium.Web.Proxy.Http2.Hpack
if (staticTableIndex == -1) if (staticTableIndex == -1)
{ {
int nameIndex = StaticTable.GetIndex(name); int nameIndex = StaticTable.GetIndex(name);
EncodeLiteral(output, name, value, HpackUtil.IndexType.None, nameIndex); encodeLiteral(output, name, value, HpackUtil.IndexType.None, nameIndex);
} }
else else
{ {
EncodeInteger(output, 0x80, 7, staticTableIndex); encodeInteger(output, 0x80, 7, staticTableIndex);
} }
return; return;
...@@ -93,18 +93,18 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -93,18 +93,18 @@ namespace Titanium.Web.Proxy.Http2.Hpack
// If the headerSize is greater than the max table size then it must be encoded literally // If the headerSize is greater than the max table size then it must be encoded literally
if (headerSize > MaxHeaderTableSize) if (headerSize > MaxHeaderTableSize)
{ {
int nameIndex = GetNameIndex(name); int nameIndex = getNameIndex(name);
EncodeLiteral(output, name, value, HpackUtil.IndexType.None, nameIndex); encodeLiteral(output, name, value, HpackUtil.IndexType.None, nameIndex);
return; return;
} }
var headerField = GetEntry(name, value); var headerField = getEntry(name, value);
if (headerField != null) if (headerField != null)
{ {
int index = GetIndex(headerField.Index) + StaticTable.Length; int index = getIndex(headerField.Index) + StaticTable.Length;
// Section 6.1. Indexed Header Field Representation // Section 6.1. Indexed Header Field Representation
EncodeInteger(output, 0x80, 7, index); encodeInteger(output, 0x80, 7, index);
} }
else else
{ {
...@@ -112,16 +112,16 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -112,16 +112,16 @@ namespace Titanium.Web.Proxy.Http2.Hpack
if (staticTableIndex != -1) if (staticTableIndex != -1)
{ {
// Section 6.1. Indexed Header Field Representation // Section 6.1. Indexed Header Field Representation
EncodeInteger(output, 0x80, 7, staticTableIndex); encodeInteger(output, 0x80, 7, staticTableIndex);
} }
else else
{ {
int nameIndex = GetNameIndex(name); int nameIndex = getNameIndex(name);
EnsureCapacity(headerSize); ensureCapacity(headerSize);
var indexType = HpackUtil.IndexType.Incremental; var indexType = HpackUtil.IndexType.Incremental;
EncodeLiteral(output, name, value, indexType, nameIndex); encodeLiteral(output, name, value, indexType, nameIndex);
Add(name, value); add(name, value);
} }
} }
} }
...@@ -144,8 +144,8 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -144,8 +144,8 @@ namespace Titanium.Web.Proxy.Http2.Hpack
} }
MaxHeaderTableSize = maxHeaderTableSize; MaxHeaderTableSize = maxHeaderTableSize;
EnsureCapacity(0); ensureCapacity(0);
EncodeInteger(output, 0x20, 5, maxHeaderTableSize); encodeInteger(output, 0x20, 5, maxHeaderTableSize);
} }
/// <summary> /// <summary>
...@@ -155,7 +155,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -155,7 +155,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// <param name="mask">Mask.</param> /// <param name="mask">Mask.</param>
/// <param name="n">N.</param> /// <param name="n">N.</param>
/// <param name="i">The index.</param> /// <param name="i">The index.</param>
private static void EncodeInteger(BinaryWriter output, int mask, int n, int i) private static void encodeInteger(BinaryWriter output, int mask, int n, int i)
{ {
if (n < 0 || n > 8) if (n < 0 || n > 8)
{ {
...@@ -190,18 +190,18 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -190,18 +190,18 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// </summary> /// </summary>
/// <param name="output">Output.</param> /// <param name="output">Output.</param>
/// <param name="stringLiteral">String literal.</param> /// <param name="stringLiteral">String literal.</param>
private void EncodeStringLiteral(BinaryWriter output, string stringLiteral) private void encodeStringLiteral(BinaryWriter output, string stringLiteral)
{ {
var stringData = Encoding.UTF8.GetBytes(stringLiteral); var stringData = Encoding.UTF8.GetBytes(stringLiteral);
int huffmanLength = HuffmanEncoder.Instance.GetEncodedLength(stringData); int huffmanLength = HuffmanEncoder.Instance.GetEncodedLength(stringData);
if (huffmanLength < stringLiteral.Length) if (huffmanLength < stringLiteral.Length)
{ {
EncodeInteger(output, 0x80, 7, huffmanLength); encodeInteger(output, 0x80, 7, huffmanLength);
HuffmanEncoder.Instance.Encode(output, stringData); HuffmanEncoder.Instance.Encode(output, stringData);
} }
else else
{ {
EncodeInteger(output, 0x00, 7, stringData.Length); encodeInteger(output, 0x00, 7, stringData.Length);
output.Write(stringData, 0, stringData.Length); output.Write(stringData, 0, stringData.Length);
} }
} }
...@@ -214,7 +214,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -214,7 +214,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// <param name="value">Value.</param> /// <param name="value">Value.</param>
/// <param name="indexType">Index type.</param> /// <param name="indexType">Index type.</param>
/// <param name="nameIndex">Name index.</param> /// <param name="nameIndex">Name index.</param>
private void EncodeLiteral(BinaryWriter output, string name, string value, HpackUtil.IndexType indexType, private void encodeLiteral(BinaryWriter output, string name, string value, HpackUtil.IndexType indexType,
int nameIndex) int nameIndex)
{ {
int mask; int mask;
...@@ -240,21 +240,21 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -240,21 +240,21 @@ namespace Titanium.Web.Proxy.Http2.Hpack
throw new Exception("should not reach here"); throw new Exception("should not reach here");
} }
EncodeInteger(output, mask, prefixBits, nameIndex == -1 ? 0 : nameIndex); encodeInteger(output, mask, prefixBits, nameIndex == -1 ? 0 : nameIndex);
if (nameIndex == -1) if (nameIndex == -1)
{ {
EncodeStringLiteral(output, name); encodeStringLiteral(output, name);
} }
EncodeStringLiteral(output, value); encodeStringLiteral(output, value);
} }
private int GetNameIndex(string name) private int getNameIndex(string name)
{ {
int index = StaticTable.GetIndex(name); int index = StaticTable.GetIndex(name);
if (index == -1) if (index == -1)
{ {
index = GetIndex(name); index = getIndex(name);
if (index >= 0) if (index >= 0)
{ {
index += StaticTable.Length; index += StaticTable.Length;
...@@ -269,24 +269,24 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -269,24 +269,24 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// Removes the oldest entry from the dynamic table until sufficient space is available. /// Removes the oldest entry from the dynamic table until sufficient space is available.
/// </summary> /// </summary>
/// <param name="headerSize">Header size.</param> /// <param name="headerSize">Header size.</param>
private void EnsureCapacity(int headerSize) private void ensureCapacity(int headerSize)
{ {
while (size + headerSize > MaxHeaderTableSize) while (size + headerSize > MaxHeaderTableSize)
{ {
int index = Length(); int index = length();
if (index == 0) if (index == 0)
{ {
break; break;
} }
Remove(); remove();
} }
} }
/// <summary> /// <summary>
/// Return the number of header fields in the dynamic table. /// Return the number of header fields in the dynamic table.
/// </summary> /// </summary>
private int Length() private int length()
{ {
return size == 0 ? 0 : head.After.Index - head.Before.Index + 1; return size == 0 ? 0 : head.After.Index - head.Before.Index + 1;
} }
...@@ -298,15 +298,15 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -298,15 +298,15 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// <returns>The entry.</returns> /// <returns>The entry.</returns>
/// <param name="name">Name.</param> /// <param name="name">Name.</param>
/// <param name="value">Value.</param> /// <param name="value">Value.</param>
private HeaderEntry GetEntry(string name, string value) private HeaderEntry getEntry(string name, string value)
{ {
if (Length() == 0 || name == null || value == null) if (length() == 0 || name == null || value == null)
{ {
return null; return null;
} }
int h = Hash(name); int h = hash(name);
int i = Index(h); int i = index(h);
for (var e = headerFields[i]; e != null; e = e.Next) for (var e = headerFields[i]; e != null; e = e.Next)
{ {
if (e.Hash == h && Equals(name, e.Name) && Equals(value, e.Value)) if (e.Hash == h && Equals(name, e.Name) && Equals(value, e.Value))
...@@ -324,15 +324,15 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -324,15 +324,15 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// </summary> /// </summary>
/// <returns>The index.</returns> /// <returns>The index.</returns>
/// <param name="name">Name.</param> /// <param name="name">Name.</param>
private int GetIndex(string name) private int getIndex(string name)
{ {
if (Length() == 0 || name == null) if (length() == 0 || name == null)
{ {
return -1; return -1;
} }
int h = Hash(name); int h = hash(name);
int i = Index(h); int i = Encoder.index(h);
int index = -1; int index = -1;
for (var e = headerFields[i]; e != null; e = e.Next) for (var e = headerFields[i]; e != null; e = e.Next)
{ {
...@@ -343,7 +343,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -343,7 +343,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
} }
} }
return GetIndex(index); return getIndex(index);
} }
/// <summary> /// <summary>
...@@ -351,7 +351,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -351,7 +351,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// </summary> /// </summary>
/// <returns>The index.</returns> /// <returns>The index.</returns>
/// <param name="index">Index.</param> /// <param name="index">Index.</param>
private int GetIndex(int index) private int getIndex(int index)
{ {
if (index == -1) if (index == -1)
{ {
...@@ -370,25 +370,25 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -370,25 +370,25 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// </summary> /// </summary>
/// <param name="name">Name.</param> /// <param name="name">Name.</param>
/// <param name="value">Value.</param> /// <param name="value">Value.</param>
private void Add(string name, string value) private void add(string name, string value)
{ {
int headerSize = HttpHeader.SizeOf(name, value); int headerSize = HttpHeader.SizeOf(name, value);
// Clear the table if the header field size is larger than the capacity. // Clear the table if the header field size is larger than the capacity.
if (headerSize > MaxHeaderTableSize) if (headerSize > MaxHeaderTableSize)
{ {
Clear(); clear();
return; return;
} }
// Evict oldest entries until we have enough capacity. // Evict oldest entries until we have enough capacity.
while (size + headerSize > MaxHeaderTableSize) while (size + headerSize > MaxHeaderTableSize)
{ {
Remove(); remove();
} }
int h = Hash(name); int h = hash(name);
int i = Index(h); int i = index(h);
var old = headerFields[i]; var old = headerFields[i];
var e = new HeaderEntry(h, name, value, head.Before.Index - 1, old); var e = new HeaderEntry(h, name, value, head.Before.Index - 1, old);
headerFields[i] = e; headerFields[i] = e;
...@@ -399,7 +399,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -399,7 +399,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// <summary> /// <summary>
/// Remove and return the oldest header field from the dynamic table. /// Remove and return the oldest header field from the dynamic table.
/// </summary> /// </summary>
private HttpHeader Remove() private HttpHeader remove()
{ {
if (size == 0) if (size == 0)
{ {
...@@ -408,7 +408,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -408,7 +408,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
var eldest = head.After; var eldest = head.After;
int h = eldest.Hash; int h = eldest.Hash;
int i = Index(h); int i = index(h);
var prev = headerFields[i]; var prev = headerFields[i];
var e = prev; var e = prev;
while (e != null) while (e != null)
...@@ -440,7 +440,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -440,7 +440,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// <summary> /// <summary>
/// Remove all entries from the dynamic table. /// Remove all entries from the dynamic table.
/// </summary> /// </summary>
private void Clear() private void clear()
{ {
for (int i = 0; i < headerFields.Length; i++) for (int i = 0; i < headerFields.Length; i++)
{ {
...@@ -456,7 +456,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -456,7 +456,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// </summary> /// </summary>
/// <returns><c>true</c> if hash name; otherwise, <c>false</c>.</returns> /// <returns><c>true</c> if hash name; otherwise, <c>false</c>.</returns>
/// <param name="name">Name.</param> /// <param name="name">Name.</param>
private static int Hash(string name) private static int hash(string name)
{ {
int h = 0; int h = 0;
for (int i = 0; i < name.Length; i++) for (int i = 0; i < name.Length; i++)
...@@ -481,7 +481,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack ...@@ -481,7 +481,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
/// Returns the index into the hash table for the hash code h. /// Returns the index into the hash table for the hash code h.
/// </summary> /// </summary>
/// <param name="h">The height.</param> /// <param name="h">The height.</param>
private static int Index(int h) private static int index(int h)
{ {
return h % bucketSize; return h % bucketSize;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment