Skip to content

Commit 898806b

Browse files
stephentoubstephentoub
committed
Strongly-type the static fields on GenericHeaderParser
1 parent 43437d2 commit 898806b

1 file changed

Lines changed: 24 additions & 43 deletions

File tree

‎src/System.Net.Http/src/System/Net/Http/Headers/GenericHeaderParser.cs‎

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,30 @@ internal sealed class GenericHeaderParser : BaseHeaderParser
1313

1414
#region Parser instances
1515

16-
internal static readonly HttpHeaderParser HostParser = new GenericHeaderParser(false, ParseHost,
17-
StringComparer.OrdinalIgnoreCase);
18-
internal static readonly HttpHeaderParser TokenListParser = new GenericHeaderParser(true, ParseTokenList,
19-
StringComparer.OrdinalIgnoreCase);
20-
internal static readonly HttpHeaderParser SingleValueNameValueWithParametersParser = new GenericHeaderParser(false,
21-
NameValueWithParametersHeaderValue.GetNameValueWithParametersLength);
22-
internal static readonly HttpHeaderParser MultipleValueNameValueWithParametersParser = new GenericHeaderParser(true,
23-
NameValueWithParametersHeaderValue.GetNameValueWithParametersLength);
24-
internal static readonly HttpHeaderParser SingleValueNameValueParser = new GenericHeaderParser(false, ParseNameValue);
25-
internal static readonly HttpHeaderParser MultipleValueNameValueParser = new GenericHeaderParser(true, ParseNameValue);
26-
internal static readonly HttpHeaderParser MailAddressParser = new GenericHeaderParser(false, ParseMailAddress);
27-
internal static readonly HttpHeaderParser SingleValueProductParser = new GenericHeaderParser(false, ParseProduct);
28-
internal static readonly HttpHeaderParser MultipleValueProductParser = new GenericHeaderParser(true, ParseProduct);
29-
internal static readonly HttpHeaderParser RangeConditionParser = new GenericHeaderParser(false,
30-
RangeConditionHeaderValue.GetRangeConditionLength);
31-
internal static readonly HttpHeaderParser SingleValueAuthenticationParser = new GenericHeaderParser(false,
32-
AuthenticationHeaderValue.GetAuthenticationLength);
33-
internal static readonly HttpHeaderParser MultipleValueAuthenticationParser = new GenericHeaderParser(true,
34-
AuthenticationHeaderValue.GetAuthenticationLength);
35-
internal static readonly HttpHeaderParser RangeParser = new GenericHeaderParser(false,
36-
RangeHeaderValue.GetRangeLength);
37-
internal static readonly HttpHeaderParser RetryConditionParser = new GenericHeaderParser(false,
38-
RetryConditionHeaderValue.GetRetryConditionLength);
39-
internal static readonly HttpHeaderParser ContentRangeParser = new GenericHeaderParser(false,
40-
ContentRangeHeaderValue.GetContentRangeLength);
41-
internal static readonly HttpHeaderParser ContentDispositionParser = new GenericHeaderParser(false,
42-
ContentDispositionHeaderValue.GetDispositionTypeLength);
43-
internal static readonly HttpHeaderParser SingleValueStringWithQualityParser = new GenericHeaderParser(false,
44-
StringWithQualityHeaderValue.GetStringWithQualityLength);
45-
internal static readonly HttpHeaderParser MultipleValueStringWithQualityParser = new GenericHeaderParser(true,
46-
StringWithQualityHeaderValue.GetStringWithQualityLength);
47-
internal static readonly HttpHeaderParser SingleValueEntityTagParser = new GenericHeaderParser(false,
48-
ParseSingleEntityTag);
49-
internal static readonly HttpHeaderParser MultipleValueEntityTagParser = new GenericHeaderParser(true,
50-
ParseMultipleEntityTags);
51-
internal static readonly HttpHeaderParser SingleValueViaParser = new GenericHeaderParser(false,
52-
ViaHeaderValue.GetViaLength);
53-
internal static readonly HttpHeaderParser MultipleValueViaParser = new GenericHeaderParser(true,
54-
ViaHeaderValue.GetViaLength);
55-
internal static readonly HttpHeaderParser SingleValueWarningParser = new GenericHeaderParser(false,
56-
WarningHeaderValue.GetWarningLength);
57-
internal static readonly HttpHeaderParser MultipleValueWarningParser = new GenericHeaderParser(true,
58-
WarningHeaderValue.GetWarningLength);
16+
internal static readonly GenericHeaderParser HostParser = new GenericHeaderParser(false, ParseHost, StringComparer.OrdinalIgnoreCase);
17+
internal static readonly GenericHeaderParser TokenListParser = new GenericHeaderParser(true, ParseTokenList, StringComparer.OrdinalIgnoreCase);
18+
internal static readonly GenericHeaderParser SingleValueNameValueWithParametersParser = new GenericHeaderParser(false, NameValueWithParametersHeaderValue.GetNameValueWithParametersLength);
19+
internal static readonly GenericHeaderParser MultipleValueNameValueWithParametersParser = new GenericHeaderParser(true, NameValueWithParametersHeaderValue.GetNameValueWithParametersLength);
20+
internal static readonly GenericHeaderParser SingleValueNameValueParser = new GenericHeaderParser(false, ParseNameValue);
21+
internal static readonly GenericHeaderParser MultipleValueNameValueParser = new GenericHeaderParser(true, ParseNameValue);
22+
internal static readonly GenericHeaderParser MailAddressParser = new GenericHeaderParser(false, ParseMailAddress);
23+
internal static readonly GenericHeaderParser SingleValueProductParser = new GenericHeaderParser(false, ParseProduct);
24+
internal static readonly GenericHeaderParser MultipleValueProductParser = new GenericHeaderParser(true, ParseProduct);
25+
internal static readonly GenericHeaderParser RangeConditionParser = new GenericHeaderParser(false, RangeConditionHeaderValue.GetRangeConditionLength);
26+
internal static readonly GenericHeaderParser SingleValueAuthenticationParser = new GenericHeaderParser(false, AuthenticationHeaderValue.GetAuthenticationLength);
27+
internal static readonly GenericHeaderParser MultipleValueAuthenticationParser = new GenericHeaderParser(true, AuthenticationHeaderValue.GetAuthenticationLength);
28+
internal static readonly GenericHeaderParser RangeParser = new GenericHeaderParser(false, RangeHeaderValue.GetRangeLength);
29+
internal static readonly GenericHeaderParser RetryConditionParser = new GenericHeaderParser(false, RetryConditionHeaderValue.GetRetryConditionLength);
30+
internal static readonly GenericHeaderParser ContentRangeParser = new GenericHeaderParser(false, ContentRangeHeaderValue.GetContentRangeLength);
31+
internal static readonly GenericHeaderParser ContentDispositionParser = new GenericHeaderParser(false, ContentDispositionHeaderValue.GetDispositionTypeLength);
32+
internal static readonly GenericHeaderParser SingleValueStringWithQualityParser = new GenericHeaderParser(false, StringWithQualityHeaderValue.GetStringWithQualityLength);
33+
internal static readonly GenericHeaderParser MultipleValueStringWithQualityParser = new GenericHeaderParser(true, StringWithQualityHeaderValue.GetStringWithQualityLength);
34+
internal static readonly GenericHeaderParser SingleValueEntityTagParser = new GenericHeaderParser(false, ParseSingleEntityTag);
35+
internal static readonly GenericHeaderParser MultipleValueEntityTagParser = new GenericHeaderParser(true, ParseMultipleEntityTags);
36+
internal static readonly GenericHeaderParser SingleValueViaParser = new GenericHeaderParser(false, ViaHeaderValue.GetViaLength);
37+
internal static readonly GenericHeaderParser MultipleValueViaParser = new GenericHeaderParser(true, ViaHeaderValue.GetViaLength);
38+
internal static readonly GenericHeaderParser SingleValueWarningParser = new GenericHeaderParser(false, WarningHeaderValue.GetWarningLength);
39+
internal static readonly GenericHeaderParser MultipleValueWarningParser = new GenericHeaderParser(true, WarningHeaderValue.GetWarningLength);
5940

6041
#endregion
6142

0 commit comments

Comments
 (0)