diff --git a/src/Serilog/Events/MessageTemplate.cs b/src/Serilog/Events/MessageTemplate.cs index ddd618e62..2e352acdb 100644 --- a/src/Serilog/Events/MessageTemplate.cs +++ b/src/Serilog/Events/MessageTemplate.cs @@ -35,8 +35,6 @@ public class MessageTemplate /// public static MessageTemplate Empty { get; } = new(Enumerable.Empty()); - readonly MessageTemplateToken[] _tokens; - /// /// Construct a message template using manually-defined text and property tokens. /// @@ -59,9 +57,9 @@ public MessageTemplate(IEnumerable tokens) public MessageTemplate(string text, IEnumerable tokens) { Text = text ?? throw new ArgumentNullException(nameof(text)); - _tokens = (tokens ?? throw new ArgumentNullException(nameof(tokens))).ToArray(); + TokenArray = (tokens ?? throw new ArgumentNullException(nameof(tokens))).ToArray(); - var propertyTokens = GetElementsOfTypeToArray(_tokens); + var propertyTokens = GetElementsOfTypeToArray(TokenArray); if (propertyTokens.Length != 0) { var allPositional = true; @@ -119,9 +117,9 @@ static TResult[] GetElementsOfTypeToArray(MessageTemplateToken[] tokens /// /// The tokens parsed from the template. /// - public IEnumerable Tokens => _tokens; + public IEnumerable Tokens => TokenArray; - internal MessageTemplateToken[] TokenArray => _tokens; + internal MessageTemplateToken[] TokenArray { get; } internal PropertyToken[]? NamedProperties { get; } diff --git a/src/Serilog/Parsing/PropertyToken.cs b/src/Serilog/Parsing/PropertyToken.cs index 295d5a062..2953b0d7c 100644 --- a/src/Serilog/Parsing/PropertyToken.cs +++ b/src/Serilog/Parsing/PropertyToken.cs @@ -28,7 +28,6 @@ namespace Serilog.Parsing /// public sealed class PropertyToken : MessageTemplateToken { - readonly string _rawText; readonly int? _position; /// @@ -62,7 +61,7 @@ public PropertyToken(string propertyName, string rawText, string? format = null, PropertyName = propertyName ?? throw new ArgumentNullException(nameof(propertyName)); Format = format; Destructuring = destructuring; - _rawText = rawText ?? throw new ArgumentNullException(nameof(rawText)); + RawText = rawText ?? throw new ArgumentNullException(nameof(rawText)); Alignment = alignment; if (int.TryParse(PropertyName, NumberStyles.None, CultureInfo.InvariantCulture, out var position) && @@ -75,7 +74,7 @@ public PropertyToken(string propertyName, string rawText, string? format = null, /// /// The token's length. /// - public override int Length => _rawText.Length; + public override int Length => RawText.Length; /// /// Render the token to the output. @@ -118,7 +117,7 @@ public override void Render(IReadOnlyDictionary p /// public bool IsPositional => _position.HasValue; - internal string RawText => _rawText; + internal string RawText { get; } /// /// Try to get the integer value represented by the property name. @@ -150,7 +149,7 @@ public override bool Equals(object? obj) pt.Destructuring == Destructuring && pt.Format == Format && pt.PropertyName == PropertyName && - pt._rawText == _rawText; + pt.RawText == RawText; } /// @@ -169,6 +168,6 @@ public override bool Equals(object? obj) /// A string that represents the current object. /// /// 2 - public override string ToString() => _rawText; + public override string ToString() => RawText; } }