diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpContentHeaders.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpContentHeaders.cs index bae8addd668fec..361e27bd8f0596 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpContentHeaders.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpContentHeaders.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; namespace System.Net.Http.Headers { @@ -16,17 +14,8 @@ public sealed class HttpContentHeaders : HttpHeaders private HttpHeaderValueCollection? _contentEncoding; private HttpHeaderValueCollection? _contentLanguage; - public ICollection Allow - { - get - { - if (_allow == null) - { - _allow = new HttpHeaderValueCollection(KnownHeaders.Allow.Descriptor, this); - } - return _allow; - } - } + public ICollection Allow => + _allow ??= new HttpHeaderValueCollection(KnownHeaders.Allow.Descriptor, this); public ContentDispositionHeaderValue? ContentDisposition { @@ -36,29 +25,11 @@ public ContentDispositionHeaderValue? ContentDisposition // Must be a collection (and not provide properties like "GZip", "Deflate", etc.) since the // order matters! - public ICollection ContentEncoding - { - get - { - if (_contentEncoding == null) - { - _contentEncoding = new HttpHeaderValueCollection(KnownHeaders.ContentEncoding.Descriptor, this); - } - return _contentEncoding; - } - } + public ICollection ContentEncoding => + _contentEncoding ??= new HttpHeaderValueCollection(KnownHeaders.ContentEncoding.Descriptor, this); - public ICollection ContentLanguage - { - get - { - if (_contentLanguage == null) - { - _contentLanguage = new HttpHeaderValueCollection(KnownHeaders.ContentLanguage.Descriptor, this); - } - return _contentLanguage; - } - } + public ICollection ContentLanguage => + _contentLanguage ??= new HttpHeaderValueCollection(KnownHeaders.ContentLanguage.Descriptor, this); public long? ContentLength { diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpGeneralHeaders.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpGeneralHeaders.cs index b5fae3e1eec5ea..4bd4694f4d5d3d 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpGeneralHeaders.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpGeneralHeaders.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections.Generic; using System.Diagnostics; namespace System.Net.Http.Headers @@ -74,29 +73,11 @@ public DateTimeOffset? Date set { _parent.SetOrRemoveParsedValue(KnownHeaders.Date.Descriptor, value); } } - public HttpHeaderValueCollection Pragma - { - get - { - if (_pragma == null) - { - _pragma = new HttpHeaderValueCollection(KnownHeaders.Pragma.Descriptor, _parent); - } - return _pragma; - } - } + public HttpHeaderValueCollection Pragma => + _pragma ??= new HttpHeaderValueCollection(KnownHeaders.Pragma.Descriptor, _parent); - public HttpHeaderValueCollection Trailer - { - get - { - if (_trailer == null) - { - _trailer = new HttpHeaderValueCollection(KnownHeaders.Trailer.Descriptor, _parent); - } - return _trailer; - } - } + public HttpHeaderValueCollection Trailer => + _trailer ??= new HttpHeaderValueCollection(KnownHeaders.Trailer.Descriptor, _parent); internal static bool? GetTransferEncodingChunked(HttpHeaders parent, HttpGeneralHeaders? headers) { @@ -139,65 +120,20 @@ public bool? TransferEncodingChunked } } - public HttpHeaderValueCollection Upgrade - { - get - { - if (_upgrade == null) - { - _upgrade = new HttpHeaderValueCollection(KnownHeaders.Upgrade.Descriptor, _parent); - } - return _upgrade; - } - } + public HttpHeaderValueCollection Upgrade => + _upgrade ??= new HttpHeaderValueCollection(KnownHeaders.Upgrade.Descriptor, _parent); - public HttpHeaderValueCollection Via - { - get - { - if (_via == null) - { - _via = new HttpHeaderValueCollection(KnownHeaders.Via.Descriptor, _parent); - } - return _via; - } - } + public HttpHeaderValueCollection Via => + _via ??= new HttpHeaderValueCollection(KnownHeaders.Via.Descriptor, _parent); - public HttpHeaderValueCollection Warning - { - get - { - if (_warning == null) - { - _warning = new HttpHeaderValueCollection(KnownHeaders.Warning.Descriptor, _parent); - } - return _warning; - } - } + public HttpHeaderValueCollection Warning => + _warning ??= new HttpHeaderValueCollection(KnownHeaders.Warning.Descriptor, _parent); - public HttpHeaderValueCollection Connection - { - get - { - if (_connection == null) - { - _connection = new HttpHeaderValueCollection(KnownHeaders.Connection.Descriptor, _parent); - } - return _connection; - } - } + public HttpHeaderValueCollection Connection => + _connection ??= new HttpHeaderValueCollection(KnownHeaders.Connection.Descriptor, _parent); - public HttpHeaderValueCollection TransferEncoding - { - get - { - if (_transferEncoding == null) - { - _transferEncoding = new HttpHeaderValueCollection(KnownHeaders.TransferEncoding.Descriptor, _parent); - } - return _transferEncoding; - } - } + public HttpHeaderValueCollection TransferEncoding => + _transferEncoding ??= new HttpHeaderValueCollection(KnownHeaders.TransferEncoding.Descriptor, _parent); internal HttpGeneralHeaders(HttpHeaders parent) {