refactor(abstractions): replace Lazy implementation with property for JSON options

src/AwsLambda.Host.Abstractions/Options/EnvelopeOptions.cs

@@ -16,36 +16,6 @@ namespace AwsLambda.Host.Options;
 /// <seealso cref="IResponseEnvelope" />
 public class EnvelopeOptions
 {
-    /// <summary>
-    ///     Gets the default JSON serialization options that match those used by
-    ///     <see cref="DefaultLambdaJsonSerializer" />.
-    /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         Provides AWS Lambda-specific JSON settings for deserialization. This is used for complex
-    ///         envelope payloads such as SNS to SQS and CloudWatch Logs.
-    ///     </para>
-    ///     <para>
-    ///         The <see cref="JsonSerializerOptions.TypeInfoResolver" /> from <see cref="JsonOptions" />
-    ///         will be added to these options during post-configuration.
-    ///     </para>
-    /// </remarks>
-    public readonly Lazy<JsonSerializerOptions> LambdaDefaultJsonOptions = new(() =>
-    {
-        var options = new JsonSerializerOptions
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-            PropertyNameCaseInsensitive = true,
-            PropertyNamingPolicy = new AwsNamingPolicy(),
-        };
-        options.Converters.Add(new DateTimeConverter());
-        options.Converters.Add(new MemoryStreamConverter());
-        options.Converters.Add(new ConstantClassConverter());
-        options.Converters.Add(new ByteArrayConverter());
-
-        return options;
-    });
-
     /// <summary>
     ///     Gets or sets a dictionary for storing custom extension data associated with envelope
     ///     processing.
@@ -72,6 +42,44 @@ public class EnvelopeOptions
     /// </remarks>
     public JsonSerializerOptions JsonOptions { get; set; } = new();
 
+    /// <summary>
+    ///     Gets the default JSON serialization options that match those used by
+    ///     <see cref="DefaultLambdaJsonSerializer" />.
+    /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///         Provides AWS Lambda-specific JSON settings for deserialization. This is used for complex
+    ///         envelope payloads such as SNS to SQS and CloudWatch Logs.
+    ///     </para>
+    ///     <para>
+    ///         During post-configuration, the <see cref="JsonSerializerOptions.TypeInfoResolver" /> from
+    ///         <see cref="JsonOptions" /> will be copied to these options if <c>TypeInfoResolver</c> has
+    ///         not been explicitly configured.
+    ///     </para>
+    /// </remarks>
+    public JsonSerializerOptions LambdaDefaultJsonOptions
+    {
+        get
+        {
+            if (field is null)
+            {
+                field = new JsonSerializerOptions
+                {
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+                    PropertyNameCaseInsensitive = true,
+                    PropertyNamingPolicy = new AwsNamingPolicy(),
+                };
+                field.Converters.Add(new DateTimeConverter());
+                field.Converters.Add(new MemoryStreamConverter());
+                field.Converters.Add(new ConstantClassConverter());
+                field.Converters.Add(new ByteArrayConverter());
+            }
+
+            return field;
+        }
+        set;
+    }
+
     /// <summary>Gets or sets the XML reader settings used when deserializing Lambda event payloads.</summary>
     /// <remarks>
     ///     <para>Options include DTD processing, whitespace handling, and conformance level.</para>

src/AwsLambda.Host/Core/Options/EnvelopeOptionsPostConfiguration.cs

@@ -5,7 +5,5 @@ namespace AwsLambda.Host.Options;
 internal class EnvelopeOptionsPostConfiguration : IPostConfigureOptions<EnvelopeOptions>
 {
     public void PostConfigure(string? name, EnvelopeOptions options) =>
-        options.LambdaDefaultJsonOptions.Value.TypeInfoResolver = options
-            .JsonOptions
-            .TypeInfoResolver;
+        options.LambdaDefaultJsonOptions.TypeInfoResolver ??= options.JsonOptions.TypeInfoResolver;
 }

src/Envelopes/AwsLambda.Host.Envelopes.CloudWatchLogs/CloudWatchLogsEnvelopeBase.cs

@@ -25,7 +25,7 @@ public virtual void ExtractPayload(EnvelopeOptions options)
         AwslogsContent =
             JsonSerializer.Deserialize<AwsLogsEnvelope>(
                 decodedData,
-                options.LambdaDefaultJsonOptions.Value
+                options.LambdaDefaultJsonOptions
             ) ?? throw new InvalidOperationException("Invalid CloudWatch Logs data.");
     }
 

src/Envelopes/AwsLambda.Host.Envelopes.Sqs/SqsSnsEnvelope.cs

@@ -39,7 +39,7 @@ public override void ExtractPayload(EnvelopeOptions options)
         {
             record.BodyContent = JsonSerializer.Deserialize<SnsEnvelopeBase<T>.SnsMessageEnvelope>(
                 record.Body,
-                options.LambdaDefaultJsonOptions.Value
+                options.LambdaDefaultJsonOptions
             );
 
             record.BodyContent!.MessageContent = JsonSerializer.Deserialize<T>(

tests/AwsLambda.Host.Envelopes.UnitTests/CloudWatchLogsEnvelopeTests.cs

@@ -429,10 +429,7 @@ object awslogsData
     {
         var envelopeOptions = new EnvelopeOptions();
 
-        var json = JsonSerializer.Serialize(
-            awslogsData,
-            envelopeOptions.LambdaDefaultJsonOptions.Value
-        );
+        var json = JsonSerializer.Serialize(awslogsData, envelopeOptions.LambdaDefaultJsonOptions);
         var jsonBytes = Encoding.UTF8.GetBytes(json);
 
         using var outputStream = new MemoryStream();
@@ -534,10 +531,7 @@ private CloudWatchLogsEnvelope CreateNonGenericEnvelopeWithAwslogsData(object aw
     {
         var envelopeOptions = new EnvelopeOptions();
 
-        var json = JsonSerializer.Serialize(
-            awslogsData,
-            envelopeOptions.LambdaDefaultJsonOptions.Value
-        );
+        var json = JsonSerializer.Serialize(awslogsData, envelopeOptions.LambdaDefaultJsonOptions);
         var jsonBytes = Encoding.UTF8.GetBytes(json);
 
         using var outputStream = new MemoryStream();