Minor fixes

Author: bkoelman

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

@@ -11,8 +11,8 @@ namespace JsonApiDotNetCore.Configuration;
 [PublicAPI]
 public sealed class JsonApiOptions : IJsonApiOptions
 {
-    private Lazy<JsonSerializerOptions> _lazySerializerWriteOptions;
-    private Lazy<JsonSerializerOptions> _lazySerializerReadOptions;
+    private readonly Lazy<JsonSerializerOptions> _lazySerializerWriteOptions;
+    private readonly Lazy<JsonSerializerOptions> _lazySerializerReadOptions;
 
     /// <inheritdoc />
     JsonSerializerOptions IJsonApiOptions.SerializerReadOptions => _lazySerializerReadOptions.Value;
@@ -110,7 +110,8 @@ static JsonApiOptions()
 
     public JsonApiOptions()
     {
-        _lazySerializerReadOptions = new Lazy<JsonSerializerOptions>(() => new JsonSerializerOptions(SerializerOptions), LazyThreadSafetyMode.PublicationOnly);
+        _lazySerializerReadOptions =
+            new Lazy<JsonSerializerOptions>(() => new JsonSerializerOptions(SerializerOptions), LazyThreadSafetyMode.ExecutionAndPublication);
 
         _lazySerializerWriteOptions = new Lazy<JsonSerializerOptions>(() => new JsonSerializerOptions(SerializerOptions)
         {
@@ -119,6 +120,6 @@ public JsonApiOptions()
                 new WriteOnlyDocumentConverter(),
                 new WriteOnlyRelationshipObjectConverter()
             }
-        }, LazyThreadSafetyMode.PublicationOnly);
+        }, LazyThreadSafetyMode.ExecutionAndPublication);
     }
 }

src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs

@@ -72,7 +72,7 @@ public async Task InvokeAsync(HttpContext httpContext, IControllerResourceMappin
                     return;
                 }
 
-                SetupOperationsRequest((JsonApiRequest)request, options, httpContext.Request);
+                SetupOperationsRequest((JsonApiRequest)request);
 
                 httpContext.RegisterJsonApiRequest();
             }
@@ -280,7 +280,7 @@ private static bool IsRouteForOperations(RouteValueDictionary routeValues)
         return actionName == "PostOperations";
     }
 
-    private static void SetupOperationsRequest(JsonApiRequest request, IJsonApiOptions options, HttpRequest httpRequest)
+    private static void SetupOperationsRequest(JsonApiRequest request)
     {
         request.IsReadOnly = false;
         request.Kind = EndpointKind.AtomicOperations;

src/JsonApiDotNetCore/Queries/Internal/Parsing/IncludeParser.cs

@@ -202,7 +202,7 @@ public string Path
                 var pathBuilder = new StringBuilder();
                 IncludeTreeNode? parent = this;
 
-                while (parent is { Relationship: not HiddenRootRelationship })
+                while (parent is { Relationship: not HiddenRootRelationshipAttribute })
                 {
                     pathBuilder.Insert(0, pathBuilder.Length > 0 ? $"{parent.Relationship.PublicName}." : parent.Relationship.PublicName);
                     parent = parent._parent;
@@ -220,7 +220,7 @@ private IncludeTreeNode(RelationshipAttribute relationship, IncludeTreeNode? par
 
         public static IncludeTreeNode CreateRoot(ResourceType resourceType)
         {
-            var relationship = new HiddenRootRelationship(resourceType);
+            var relationship = new HiddenRootRelationshipAttribute(resourceType);
             return new IncludeTreeNode(relationship, null);
         }
 
@@ -242,7 +242,7 @@ public IncludeExpression ToExpression()
         {
             IncludeElementExpression element = ToElementExpression();
 
-            if (element.Relationship is HiddenRootRelationship)
+            if (element.Relationship is HiddenRootRelationshipAttribute)
             {
                 return new IncludeExpression(element.Children);
             }
@@ -262,9 +262,9 @@ public override string ToString()
             return include.ToFullString();
         }
 
-        private sealed class HiddenRootRelationship : RelationshipAttribute
+        private sealed class HiddenRootRelationshipAttribute : RelationshipAttribute
         {
-            public HiddenRootRelationship(ResourceType rightType)
+            public HiddenRootRelationshipAttribute(ResourceType rightType)
             {
                 ArgumentGuard.NotNull(rightType, nameof(rightType));
 

src/JsonApiDotNetCore/Serialization/JsonConverters/SingleOrManyDataConverterFactory.cs

@@ -28,7 +28,7 @@ public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializer
     private sealed class SingleOrManyDataConverter<T> : JsonObjectConverter<SingleOrManyData<T>>
         where T : class, IResourceIdentity, new()
     {
-        public override SingleOrManyData<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions serializerOptions)
+        public override SingleOrManyData<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             var objects = new List<T?>();
             bool isManyData = false;
@@ -54,7 +54,7 @@ public override SingleOrManyData<T> Read(ref Utf8JsonReader reader, Type typeToC
                     }
                     case JsonTokenType.StartObject:
                     {
-                        var resourceObject = ReadSubTree<T>(ref reader, serializerOptions);
+                        var resourceObject = ReadSubTree<T>(ref reader, options);
                         objects.Add(resourceObject);
                         break;
                     }