Merge branch 'maintenance/code-analysis' into develop

With the tests updated to .NET 6, additional nullability hints were exposed, which allowed us to address potential nulls via our code in alignment with these hints. In addition, did some minor refactoring to take advantage of pattern matching in the filter attributes.

Author: JeremyCaney

OnTopic.AspNetCore.Mvc.Tests/TopicViewComponentTest.cs

@@ -121,7 +121,7 @@ public async Task Menu_Invoke_ReturnsNavigationViewModel() {
 
       var result                = await viewComponent.InvokeAsync().ConfigureAwait(false);
       var concreteResult        = result as ViewViewComponentResult;
-      var model                 = concreteResult?.ViewData.Model as NavigationViewModel<NavigationTopicViewModel>;
+      var model                 = concreteResult?.ViewData?.Model as NavigationViewModel<NavigationTopicViewModel>;
 
       Assert.NotNull(model);
       Assert.Equal(_topic.GetWebPath(), model?.CurrentWebPath);
@@ -147,7 +147,7 @@ public async Task Menu_Invoke_ReturnsConfiguredNavigationRoot() {
 
       var result                = await viewComponent.InvokeAsync().ConfigureAwait(false);
       var concreteResult        = result as ViewViewComponentResult;
-      var model                 = concreteResult?.ViewData.Model as NavigationViewModel<NavigationTopicViewModel>;
+      var model                 = concreteResult?.ViewData?.Model as NavigationViewModel<NavigationTopicViewModel>;
 
       Assert.NotNull(model);
       Assert.Equal(webPath, model?.CurrentWebPath);
@@ -194,7 +194,7 @@ public async Task PageLevelNavigation_Invoke_ReturnsNavigationViewModel() {
 
       var result                = await viewComponent.InvokeAsync().ConfigureAwait(false);
       var concreteResult        = result as ViewViewComponentResult;
-      var model                 = concreteResult?.ViewData.Model as NavigationViewModel<NavigationTopicViewModel>;
+      var model                 = concreteResult?.ViewData?.Model as NavigationViewModel<NavigationTopicViewModel>;
 
       Assert.NotNull(model);
       Assert.Equal(_topic.GetWebPath(), model?.CurrentWebPath);
@@ -222,7 +222,7 @@ public async Task PageLevelNavigation_Invoke_ReturnsNull() {
 
       var result                = await viewComponent.InvokeAsync().ConfigureAwait(false);
       var concreteResult        = result as ViewViewComponentResult;
-      var model                 = concreteResult?.ViewData.Model as NavigationViewModel<NavigationTopicViewModel>;
+      var model                 = concreteResult?.ViewData?.Model as NavigationViewModel<NavigationTopicViewModel>;
 
       Assert.NotNull(model);
       Assert.Equal(webPath, model?.CurrentWebPath);
@@ -250,7 +250,7 @@ public async Task PageLevelNavigation_InvokeWithNullTopic_ReturnsNull()
 
       var result = await viewComponent.InvokeAsync().ConfigureAwait(false);
       var concreteResult = result as ViewViewComponentResult;
-      var model = concreteResult?.ViewData.Model as NavigationViewModel<NavigationTopicViewModel>;
+      var model = concreteResult?.ViewData?.Model as NavigationViewModel<NavigationTopicViewModel>;
 
       Assert.NotNull(model);
       Assert.Equal(String.Empty, model?.CurrentWebPath);

OnTopic.AspNetCore.Mvc.Tests/ValidateTopicAttributeTest.cs

@@ -44,7 +44,7 @@ public static ActionExecutingContext GetActionExecutingContext(Controller contro
       var actionExecutingContext = new ActionExecutingContext(
         actionContext,
         new List<IFilterMetadata>(),
-        new Dictionary<string, object>(),
+        new Dictionary<string, object?>(),
         controller
       );
 

OnTopic.AspNetCore.Mvc/_filters/TopicResponseCacheAttribute.cs

@@ -62,9 +62,7 @@ public override void OnActionExecuting(ActionExecutingContext context) {
       /*------------------------------------------------------------------------------------------------------------------------
       | Validate controller
       \-----------------------------------------------------------------------------------------------------------------------*/
-      var controller            = context.Controller as TopicController;
-
-      if (controller is null) {
+      if (context.Controller is not TopicController controller) {
         throw new InvalidOperationException(
           $"The {nameof(TopicResponseCacheAttribute)} can only be applied to a controller deriving from {nameof(TopicController)}."
         );

OnTopic.AspNetCore.Mvc/_filters/ValidateTopicAttribute.cs

@@ -60,23 +60,19 @@ public override void OnActionExecuting(ActionExecutingContext context) {
       Contract.Requires(context, nameof(context));
 
       /*------------------------------------------------------------------------------------------------------------------------
-      | Establish variables
+      | Validate controller
       \-----------------------------------------------------------------------------------------------------------------------*/
-      var controller            = context.Controller as TopicController;
-      var currentTopic          = controller?.CurrentTopic;
-
-      /*------------------------------------------------------------------------------------------------------------------------
-      | Validate context
-      \-----------------------------------------------------------------------------------------------------------------------*/
-      if (controller is null) {
+      if (context.Controller is not TopicController controller) {
         throw new InvalidOperationException(
-          $"The {nameof(ValidateTopicAttribute)} can only be applied to a controller deriving from {nameof(TopicController)}."
+          $"The {nameof(TopicResponseCacheAttribute)} can only be applied to a controller deriving from {nameof(TopicController)}."
         );
       }
 
       /*------------------------------------------------------------------------------------------------------------------------
-      | Handle exceptions
+      | Validate current topic
       \-----------------------------------------------------------------------------------------------------------------------*/
+      var currentTopic          = controller.CurrentTopic;
+
       if (currentTopic is null) {
         if (!AllowNull) {
           context.Result = controller.NotFound("There is no topic associated with this path.");