Resolved new warnings

Bart Koelman · Bart Koelman · commit 63f1d8390336 · 2021-07-21T10:34:06.000+02:00
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs b/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs
@@ -41,7 +41,7 @@ public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEnt
 
             var httpContextAccessor = _serviceProvider.GetRequiredService<IHttpContextAccessor>();
 
-            if (httpContextAccessor.HttpContext.Request.Method == HttpMethods.Patch || request.OperationKind == OperationKind.UpdateResource)
+            if (httpContextAccessor.HttpContext!.Request.Method == HttpMethods.Patch || request.OperationKind == OperationKind.UpdateResource)
             {
                 var targetedFields = _serviceProvider.GetRequiredService<ITargetedFields>();
                 return IsFieldTargeted(entry, targetedFields);
diff --git a/src/JsonApiDotNetCore/Middleware/FixedQueryFeature.cs b/src/JsonApiDotNetCore/Middleware/FixedQueryFeature.cs
@@ -27,7 +27,7 @@ public IQueryCollection Query
         {
             get
             {
-                if (_features.Collection == null)
+                if (IsFeatureCollectionNull())
                 {
                     return _parsedValues ??= QueryCollection.Empty;
                 }
@@ -49,7 +49,7 @@ public IQueryCollection Query
             {
                 _parsedValues = value;
 
-                if (_features.Collection != null)
+                if (!IsFeatureCollectionNull())
                 {
                     if (value == null)
                     {
@@ -77,5 +77,12 @@ public FixedQueryFeature(IFeatureCollection features)
 
             _features.Initalize(features);
         }
+
+        private bool IsFeatureCollectionNull()
+        {
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+            // Justification: This code was copied from the ASP.NET sources. A struct instance can be created without calling one of its constructors.
+            return _features.Collection == null;
+        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs b/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs
@@ -125,6 +125,8 @@ private static async Task<bool> ValidateContentTypeHeaderAsync(string allowedCon
         {
             string contentType = httpContext.Request.ContentType;
 
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+            // Justification: Workaround for https://github.com/dotnet/aspnetcore/issues/32097 (fixed in .NET 6)
             if (contentType != null && contentType != allowedContentType)
             {
                 await FlushResponseAsync(httpContext.Response, serializerSettings, new Error(HttpStatusCode.UnsupportedMediaType)
@@ -280,9 +282,9 @@ private static string GetCustomRoute(string resourceName, string apiNamespace, H
             if (resourceName != null)
             {
                 Endpoint endpoint = httpContext.GetEndpoint();
-                var routeAttribute = endpoint.Metadata.GetMetadata<RouteAttribute>();
+                var routeAttribute = endpoint?.Metadata.GetMetadata<RouteAttribute>();
 
-                if (routeAttribute != null)
+                if (routeAttribute != null && httpContext.Request.Path.Value != null)
                 {
                     List<string> trimmedComponents = httpContext.Request.Path.Value.Trim('/').Split('/').ToList();
                     int resourceNameIndex = trimmedComponents.FindIndex(component => component == resourceName);
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/RequestQueryStringAccessor.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/RequestQueryStringAccessor.cs
@@ -7,7 +7,7 @@ internal sealed class RequestQueryStringAccessor : IRequestQueryStringAccessor
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public IQueryCollection Query => _httpContextAccessor.HttpContext.Request.Query;
+        public IQueryCollection Query => _httpContextAccessor.HttpContext!.Request.Query;
 
         public RequestQueryStringAccessor(IHttpContextAccessor httpContextAccessor)
         {
diff --git a/src/JsonApiDotNetCore/Serialization/Building/LinkBuilder.cs b/src/JsonApiDotNetCore/Serialization/Building/LinkBuilder.cs
@@ -102,8 +102,8 @@ private bool ShouldIncludeTopLevelLink(LinkTypes linkType, ResourceContext resou
         private string GetLinkForTopLevelSelf()
         {
             return _options.UseRelativeLinks
-                ? _httpContextAccessor.HttpContext.Request.GetEncodedPathAndQuery()
-                : _httpContextAccessor.HttpContext.Request.GetEncodedUrl();
+                ? _httpContextAccessor.HttpContext!.Request.GetEncodedPathAndQuery()
+                : _httpContextAccessor.HttpContext!.Request.GetEncodedUrl();
         }
 
         private void SetPaginationInTopLevelLinks(ResourceContext requestContext, TopLevelLinks links)
@@ -133,7 +133,7 @@ private void SetPaginationInTopLevelLinks(ResourceContext requestContext, TopLev
 
         private string CalculatePageSizeValue(PageSize topPageSize, ResourceContext requestContext)
         {
-            string pageSizeParameterValue = _httpContextAccessor.HttpContext.Request.Query[PageSizeParameterName];
+            string pageSizeParameterValue = _httpContextAccessor.HttpContext!.Request.Query[PageSizeParameterName];
 
             PageSize newTopPageSize = Equals(topPageSize, _options.DefaultPageSize) ? null : topPageSize;
             return ChangeTopPageSize(pageSizeParameterValue, newTopPageSize, requestContext);
@@ -188,7 +188,7 @@ private string GetLinkForPagination(int pageOffset, string pageSizeValue)
         {
             string queryStringValue = GetQueryStringInPaginationLink(pageOffset, pageSizeValue);
 
-            var builder = new UriBuilder(_httpContextAccessor.HttpContext.Request.GetEncodedUrl())
+            var builder = new UriBuilder(_httpContextAccessor.HttpContext!.Request.GetEncodedUrl())
             {
                 Query = queryStringValue
             };
@@ -200,7 +200,7 @@ private string GetLinkForPagination(int pageOffset, string pageSizeValue)
         private string GetQueryStringInPaginationLink(int pageOffset, string pageSizeValue)
         {
             IDictionary<string, string> parameters =
-                _httpContextAccessor.HttpContext.Request.Query.ToDictionary(pair => pair.Key, pair => pair.Value.ToString());
+                _httpContextAccessor.HttpContext!.Request.Query.ToDictionary(pair => pair.Key, pair => pair.Value.ToString());
 
             if (pageSizeValue == null)
             {
@@ -311,7 +311,7 @@ private IDictionary<string, object> GetRouteValues(string primaryId, string rela
             // By default, we copy all route parameters from the *current* endpoint, which helps in case all endpoints have the same
             // set of non-standard parameters. There is no way we can know which non-standard parameters a *different* endpoint needs,
             // so users must override RenderLinkForAction to supply them, if applicable.
-            RouteValueDictionary routeValues = _httpContextAccessor.HttpContext.Request.RouteValues;
+            RouteValueDictionary routeValues = _httpContextAccessor.HttpContext!.Request.RouteValues;
 
             routeValues["id"] = primaryId;
             routeValues["relationshipName"] = relationshipName;
diff --git a/src/JsonApiDotNetCore/Serialization/JsonApiReader.cs b/src/JsonApiDotNetCore/Serialization/JsonApiReader.cs
@@ -81,6 +81,8 @@ public async Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
                 ValidateRequestBody(model, body, context.HttpContext.Request);
             }
 
+            // ReSharper disable once AssignNullToNotNullAttribute
+            // Justification: According to JSON:API we must return 200 OK without a body in some cases.
             return await InputFormatterResult.SuccessAsync(model);
         }
 
diff --git a/src/JsonApiDotNetCore/Serialization/RequestDeserializer.cs b/src/JsonApiDotNetCore/Serialization/RequestDeserializer.cs
@@ -523,14 +523,14 @@ private bool IsCreatingResource()
         {
             return _request.Kind == EndpointKind.AtomicOperations
                 ? _request.OperationKind == OperationKind.CreateResource
-                : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext.Request.Method == HttpMethod.Post.Method;
+                : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext!.Request.Method == HttpMethod.Post.Method;
         }
 
         private bool IsUpdatingResource()
         {
             return _request.Kind == EndpointKind.AtomicOperations
                 ? _request.OperationKind == OperationKind.UpdateResource
-                : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext.Request.Method == HttpMethod.Patch.Method;
+                : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext!.Request.Method == HttpMethod.Patch.Method;
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs
@@ -34,7 +34,7 @@ public async Task Returns_JsonApi_ContentType_header()
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.MediaType);
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be(HeaderConstants.MediaType);
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public async Task Returns_JsonApi_ContentType_header_with_AtomicOperations_exten
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.AtomicOperationsMediaType);
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be(HeaderConstants.AtomicOperationsMediaType);
         }
 
         [Fact]
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Logging/LoggingTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Logging/LoggingTests.cs
@@ -31,7 +31,7 @@ public LoggingTests(ExampleIntegrationTestContext<TestableStartup<AuditDbContext
                 options.ClearProviders();
                 options.AddProvider(loggerFactory);
                 options.SetMinimumLevel(LogLevel.Trace);
-                options.AddFilter((_, __) => true);
+                options.AddFilter((_, _) => true);
             });
 
             testContext.ConfigureServicesBeforeStartup(services =>
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs
@@ -19,8 +19,13 @@ public Guid TenantId
         {
             get
             {
+                if (_httpContextAccessor.HttpContext == null)
+                {
+                    throw new InvalidOperationException();
+                }
+
                 string countryCode = (string)_httpContextAccessor.HttpContext.Request.RouteValues["countryCode"];
-                return TenantRegistry.ContainsKey(countryCode) ? TenantRegistry[countryCode] : Guid.Empty;
+                return countryCode != null && TenantRegistry.ContainsKey(countryCode) ? TenantRegistry[countryCode] : Guid.Empty;
             }
         }
 
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs
@@ -32,7 +32,7 @@ public async Task Get_skips_middleware_and_formatters()
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("application/json; charset=utf-8");
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be("application/json; charset=utf-8");
 
             string responseText = await httpResponse.Content.ReadAsStringAsync();
             responseText.Should().Be("[\"Welcome!\"]");
@@ -60,7 +60,7 @@ public async Task Post_skips_middleware_and_formatters()
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be("text/plain; charset=utf-8");
 
             string responseText = await httpResponse.Content.ReadAsStringAsync();
             responseText.Should().Be("Hello, Jack");
@@ -79,7 +79,7 @@ public async Task Post_skips_error_handler()
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be("text/plain; charset=utf-8");
 
             string responseText = await httpResponse.Content.ReadAsStringAsync();
             responseText.Should().Be("Please send your name.");
@@ -107,7 +107,7 @@ public async Task Put_skips_middleware_and_formatters()
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be("text/plain; charset=utf-8");
 
             string responseText = await httpResponse.Content.ReadAsStringAsync();
             responseText.Should().Be("Hi, Jane");
@@ -126,7 +126,7 @@ public async Task Patch_skips_middleware_and_formatters()
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be("text/plain; charset=utf-8");
 
             string responseText = await httpResponse.Content.ReadAsStringAsync();
             responseText.Should().Be("Good day, Janice");
@@ -145,7 +145,7 @@ public async Task Delete_skips_middleware_and_formatters()
 
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+            httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be("text/plain; charset=utf-8");
 
             string responseText = await httpResponse.Content.ReadAsStringAsync();
             responseText.Should().Be("Bye.");
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Serialization/ETagTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Serialization/ETagTests.cs
@@ -47,7 +47,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
             httpResponse.Headers.ETag.Should().NotBeNull();
-            httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
+            httpResponse.Headers.ETag!.IsWeak.Should().BeFalse();
             httpResponse.Headers.ETag.Tag.Should().NotBeNullOrEmpty();
 
             responseDocument.Should().BeEmpty();
@@ -75,7 +75,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
             httpResponse.Headers.ETag.Should().NotBeNull();
-            httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
+            httpResponse.Headers.ETag!.IsWeak.Should().BeFalse();
             httpResponse.Headers.ETag.Tag.Should().NotBeNullOrEmpty();
 
             responseDocument.Should().NotBeEmpty();
@@ -195,7 +195,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
             (HttpResponseMessage httpResponse1, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            string responseETag = httpResponse1.Headers.ETag.Tag;
+            string responseETag = httpResponse1.Headers.ETag!.Tag;
 
             Action<HttpRequestHeaders> setRequestHeaders2 = headers =>
             {
@@ -209,7 +209,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             httpResponse2.Should().HaveStatusCode(HttpStatusCode.NotModified);
 
             httpResponse2.Headers.ETag.Should().NotBeNull();
-            httpResponse2.Headers.ETag.IsWeak.Should().BeFalse();
+            httpResponse2.Headers.ETag!.IsWeak.Should().BeFalse();
             httpResponse2.Headers.ETag.Tag.Should().NotBeNullOrEmpty();
 
             responseDocument2.Should().BeEmpty();
@@ -242,7 +242,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
             httpResponse.Headers.ETag.Should().NotBeNull();
-            httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
+            httpResponse.Headers.ETag!.IsWeak.Should().BeFalse();
             httpResponse.Headers.ETag.Tag.Should().NotBeNullOrEmpty();
 
             responseDocument.Should().NotBeEmpty();
diff --git a/test/TestBuildingBlocks/FakerContainer.cs b/test/TestBuildingBlocks/FakerContainer.cs
@@ -22,7 +22,7 @@ private static MethodBase GetTestMethod()
         {
             var stackTrace = new StackTrace();
 
-            MethodBase testMethod = stackTrace.GetFrames().Select(stackFrame => stackFrame?.GetMethod()).FirstOrDefault(IsTestMethod);
+            MethodBase testMethod = stackTrace.GetFrames().Select(stackFrame => stackFrame.GetMethod()).FirstOrDefault(IsTestMethod);
 
             if (testMethod == null)
             {
diff --git a/test/UnitTests/Middleware/JsonApiMiddlewareTests.cs b/test/UnitTests/Middleware/JsonApiMiddlewareTests.cs
@@ -159,7 +159,7 @@ private static DefaultHttpContext CreateHttpContext(string path, bool isRelation
                 ControllerTypeInfo = (TypeInfo)typeof(object)
             };
 
-            context.SetEndpoint(new Endpoint(null, new EndpointMetadataCollection(controllerActionDescriptor), null));
+            context.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(controllerActionDescriptor), null));
             return context;
         }
 
@@ -192,12 +192,12 @@ private Mock<IResourceGraph> CreateMockResourceGraph(string resourceName, bool i
 
         private sealed class InvokeConfiguration
         {
-            public JsonApiMiddleware MiddleWare { get; set; }
-            public HttpContext HttpContext { get; set; }
-            public Mock<IControllerResourceMapping> ControllerResourceMapping { get; set; }
-            public Mock<IJsonApiOptions> Options { get; set; }
-            public JsonApiRequest Request { get; set; }
-            public Mock<IResourceGraph> ResourceGraph { get; set; }
+            public JsonApiMiddleware MiddleWare { get; init; }
+            public HttpContext HttpContext { get; init; }
+            public Mock<IControllerResourceMapping> ControllerResourceMapping { get; init; }
+            public Mock<IJsonApiOptions> Options { get; init; }
+            public JsonApiRequest Request { get; init; }
+            public Mock<IResourceGraph> ResourceGraph { get; init; }
         }
     }
 }
diff --git a/test/UnitTests/Middleware/JsonApiRequestTests.cs b/test/UnitTests/Middleware/JsonApiRequestTests.cs
@@ -112,7 +112,7 @@ private static void SetupRoutes(HttpContext httpContext, string requestMethod, s
                 ControllerTypeInfo = (TypeInfo)typeof(object)
             };
 
-            httpContext.SetEndpoint(new Endpoint(null, new EndpointMetadataCollection(controllerActionDescriptor), null));
+            httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(controllerActionDescriptor), null));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEnt`
`41`	`41`
`42`	`42`	`var httpContextAccessor = _serviceProvider.GetRequiredService<IHttpContextAccessor>();`
`43`	`43`
`44`		`- if (httpContextAccessor.HttpContext.Request.Method == HttpMethods.Patch \|\| request.OperationKind == OperationKind.UpdateResource)`
	`44`	`+ if (httpContextAccessor.HttpContext!.Request.Method == HttpMethods.Patch \|\| request.OperationKind == OperationKind.UpdateResource)`
`45`	`45`	`{`
`46`	`46`	`var targetedFields = _serviceProvider.GetRequiredService<ITargetedFields>();`
`47`	`47`	`return IsFieldTargeted(entry, targetedFields);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public IQueryCollection Query`
`27`	`27`	`{`
`28`	`28`	`get`
`29`	`29`	`{`
`30`		`- if (_features.Collection == null)`
	`30`	`+ if (IsFeatureCollectionNull())`
`31`	`31`	`{`
`32`	`32`	`return _parsedValues ??= QueryCollection.Empty;`
`33`	`33`	`}`
`@@ -49,7 +49,7 @@ public IQueryCollection Query`
`49`	`49`	`{`
`50`	`50`	`_parsedValues = value;`
`51`	`51`
`52`		`- if (_features.Collection != null)`
	`52`	`+ if (!IsFeatureCollectionNull())`
`53`	`53`	`{`
`54`	`54`	`if (value == null)`
`55`	`55`	`{`
`@@ -77,5 +77,12 @@ public FixedQueryFeature(IFeatureCollection features)`
`77`	`77`
`78`	`78`	`_features.Initalize(features);`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ private bool IsFeatureCollectionNull()`
	`82`	`+ {`
	`83`	`+ // ReSharper disable once ConditionIsAlwaysTrueOrFalse`
	`84`	`+ // Justification: This code was copied from the ASP.NET sources. A struct instance can be created without calling one of its constructors.`
	`85`	`+ return _features.Collection == null;`
	`86`	`+ }`
`80`	`87`	`}`
`81`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ private static async Task<bool> ValidateContentTypeHeaderAsync(string allowedCon`
`125`	`125`	`{`
`126`	`126`	`string contentType = httpContext.Request.ContentType;`
`127`	`127`
	`128`	`+ // ReSharper disable once ConditionIsAlwaysTrueOrFalse`
	`129`	`+ // Justification: Workaround for https://github.com/dotnet/aspnetcore/issues/32097 (fixed in .NET 6)`
`128`	`130`	`if (contentType != null && contentType != allowedContentType)`
`129`	`131`	`{`
`130`	`132`	`await FlushResponseAsync(httpContext.Response, serializerSettings, new Error(HttpStatusCode.UnsupportedMediaType)`
`@@ -280,9 +282,9 @@ private static string GetCustomRoute(string resourceName, string apiNamespace, H`
`280`	`282`	`if (resourceName != null)`
`281`	`283`	`{`
`282`	`284`	`Endpoint endpoint = httpContext.GetEndpoint();`
`283`		`- var routeAttribute = endpoint.Metadata.GetMetadata<RouteAttribute>();`
	`285`	`+ var routeAttribute = endpoint?.Metadata.GetMetadata<RouteAttribute>();`
`284`	`286`
`285`		`- if (routeAttribute != null)`
	`287`	`+ if (routeAttribute != null && httpContext.Request.Path.Value != null)`
`286`	`288`	`{`
`287`	`289`	`List<string> trimmedComponents = httpContext.Request.Path.Value.Trim('/').Split('/').ToList();`
`288`	`290`	`int resourceNameIndex = trimmedComponents.FindIndex(component => component == resourceName);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ internal sealed class RequestQueryStringAccessor : IRequestQueryStringAccessor`
`7`	`7`	`{`
`8`	`8`	`private readonly IHttpContextAccessor _httpContextAccessor;`
`9`	`9`
`10`		`- public IQueryCollection Query => _httpContextAccessor.HttpContext.Request.Query;`
	`10`	`+ public IQueryCollection Query => _httpContextAccessor.HttpContext!.Request.Query;`
`11`	`11`
`12`	`12`	`public RequestQueryStringAccessor(IHttpContextAccessor httpContextAccessor)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ private bool ShouldIncludeTopLevelLink(LinkTypes linkType, ResourceContext resou`
`102`	`102`	`private string GetLinkForTopLevelSelf()`
`103`	`103`	`{`
`104`	`104`	`return _options.UseRelativeLinks`
`105`		`- ? _httpContextAccessor.HttpContext.Request.GetEncodedPathAndQuery()`
`106`		`- : _httpContextAccessor.HttpContext.Request.GetEncodedUrl();`
	`105`	`+ ? _httpContextAccessor.HttpContext!.Request.GetEncodedPathAndQuery()`
	`106`	`+ : _httpContextAccessor.HttpContext!.Request.GetEncodedUrl();`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`private void SetPaginationInTopLevelLinks(ResourceContext requestContext, TopLevelLinks links)`
`@@ -133,7 +133,7 @@ private void SetPaginationInTopLevelLinks(ResourceContext requestContext, TopLev`
`133`	`133`
`134`	`134`	`private string CalculatePageSizeValue(PageSize topPageSize, ResourceContext requestContext)`
`135`	`135`	`{`
`136`		`- string pageSizeParameterValue = _httpContextAccessor.HttpContext.Request.Query[PageSizeParameterName];`
	`136`	`+ string pageSizeParameterValue = _httpContextAccessor.HttpContext!.Request.Query[PageSizeParameterName];`
`137`	`137`
`138`	`138`	`PageSize newTopPageSize = Equals(topPageSize, _options.DefaultPageSize) ? null : topPageSize;`
`139`	`139`	`return ChangeTopPageSize(pageSizeParameterValue, newTopPageSize, requestContext);`
`@@ -188,7 +188,7 @@ private string GetLinkForPagination(int pageOffset, string pageSizeValue)`
`188`	`188`	`{`
`189`	`189`	`string queryStringValue = GetQueryStringInPaginationLink(pageOffset, pageSizeValue);`
`190`	`190`
`191`		`- var builder = new UriBuilder(_httpContextAccessor.HttpContext.Request.GetEncodedUrl())`
	`191`	`+ var builder = new UriBuilder(_httpContextAccessor.HttpContext!.Request.GetEncodedUrl())`
`192`	`192`	`{`
`193`	`193`	`Query = queryStringValue`
`194`	`194`	`};`
`@@ -200,7 +200,7 @@ private string GetLinkForPagination(int pageOffset, string pageSizeValue)`
`200`	`200`	`private string GetQueryStringInPaginationLink(int pageOffset, string pageSizeValue)`
`201`	`201`	`{`
`202`	`202`	`IDictionary<string, string> parameters =`
`203`		`- _httpContextAccessor.HttpContext.Request.Query.ToDictionary(pair => pair.Key, pair => pair.Value.ToString());`
	`203`	`+ _httpContextAccessor.HttpContext!.Request.Query.ToDictionary(pair => pair.Key, pair => pair.Value.ToString());`
`204`	`204`
`205`	`205`	`if (pageSizeValue == null)`
`206`	`206`	`{`
`@@ -311,7 +311,7 @@ private IDictionary<string, object> GetRouteValues(string primaryId, string rela`
`311`	`311`	`// By default, we copy all route parameters from the current endpoint, which helps in case all endpoints have the same`
`312`	`312`	`// set of non-standard parameters. There is no way we can know which non-standard parameters a different endpoint needs,`
`313`	`313`	`// so users must override RenderLinkForAction to supply them, if applicable.`
`314`		`- RouteValueDictionary routeValues = _httpContextAccessor.HttpContext.Request.RouteValues;`
	`314`	`+ RouteValueDictionary routeValues = _httpContextAccessor.HttpContext!.Request.RouteValues;`
`315`	`315`
`316`	`316`	`routeValues["id"] = primaryId;`
`317`	`317`	`routeValues["relationshipName"] = relationshipName;`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ public async Task<InputFormatterResult> ReadAsync(InputFormatterContext context)`
`81`	`81`	`ValidateRequestBody(model, body, context.HttpContext.Request);`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ // ReSharper disable once AssignNullToNotNullAttribute`
	`85`	`+ // Justification: According to JSON:API we must return 200 OK without a body in some cases.`
`84`	`86`	`return await InputFormatterResult.SuccessAsync(model);`
`85`	`87`	`}`
`86`	`88`
Original file line number	Diff line number	Diff line change
`@@ -523,14 +523,14 @@ private bool IsCreatingResource()`
`523`	`523`	`{`
`524`	`524`	`return _request.Kind == EndpointKind.AtomicOperations`
`525`	`525`	`? _request.OperationKind == OperationKind.CreateResource`
`526`		`- : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext.Request.Method == HttpMethod.Post.Method;`
	`526`	`+ : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext!.Request.Method == HttpMethod.Post.Method;`
`527`	`527`	`}`
`528`	`528`
`529`	`529`	`private bool IsUpdatingResource()`
`530`	`530`	`{`
`531`	`531`	`return _request.Kind == EndpointKind.AtomicOperations`
`532`	`532`	`? _request.OperationKind == OperationKind.UpdateResource`
`533`		`- : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext.Request.Method == HttpMethod.Patch.Method;`
	`533`	`+ : _request.Kind == EndpointKind.Primary && _httpContextAccessor.HttpContext!.Request.Method == HttpMethod.Patch.Method;`
`534`	`534`	`}`
`535`	`535`	`}`
`536`	`536`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public async Task Returns_JsonApi_ContentType_header()`
`34`	`34`
`35`	`35`	`// Assert`
`36`	`36`	`httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);`
`37`		`- httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.MediaType);`
	`37`	`+ httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be(HeaderConstants.MediaType);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[Fact]`
`@@ -67,7 +67,7 @@ public async Task Returns_JsonApi_ContentType_header_with_AtomicOperations_exten`
`67`	`67`
`68`	`68`	`// Assert`
`69`	`69`	`httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);`
`70`		`- httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.AtomicOperationsMediaType);`
	`70`	`+ httpResponse.Content.Headers.ContentType.Should().NotBeNull().And.Subject.ToString().Should().Be(HeaderConstants.AtomicOperationsMediaType);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,13 @@ public Guid TenantId`
`19`	`19`	`{`
`20`	`20`	`get`
`21`	`21`	`{`
	`22`	`+ if (_httpContextAccessor.HttpContext == null)`
	`23`	`+ {`
	`24`	`+ throw new InvalidOperationException();`
	`25`	`+ }`
	`26`	`+`
`22`	`27`	`string countryCode = (string)_httpContextAccessor.HttpContext.Request.RouteValues["countryCode"];`
`23`		`- return TenantRegistry.ContainsKey(countryCode) ? TenantRegistry[countryCode] : Guid.Empty;`
	`28`	`+ return countryCode != null && TenantRegistry.ContainsKey(countryCode) ? TenantRegistry[countryCode] : Guid.Empty;`
`24`	`29`	`}`
`25`	`30`	`}`
`26`	`31`