Remove Guard class

Author: gunndabad

src/GovUk.Frontend.AspNetCore/AttributeDictionaryExtensions.cs

@@ -18,7 +18,7 @@ internal static class AttributeDictionaryExtensions
     /// <param name="value">The CSS class name to add.</param>
     public static void MergeCssClass(this AttributeDictionary attributeDictionary, string? value)
     {
-        Guard.ArgumentNotNull(nameof(attributeDictionary), attributeDictionary);
+        ArgumentNullException.ThrowIfNull(attributeDictionary);
 
         if (string.IsNullOrEmpty(value))
         {

src/GovUk.Frontend.AspNetCore/DefaultModelHelper.cs

@@ -42,9 +42,9 @@ public virtual string GetFullHtmlFieldName(ViewContext viewContext, string expre
 
     public virtual string? GetModelValue(ViewContext viewContext, ModelExplorer modelExplorer, string expression)
     {
-        Guard.ArgumentNotNull(nameof(viewContext), viewContext);
-        Guard.ArgumentNotNull(nameof(modelExplorer), modelExplorer);
-        Guard.ArgumentNotNull(nameof(expression), expression);
+        ArgumentNullException.ThrowIfNull(viewContext);
+        ArgumentNullException.ThrowIfNull(modelExplorer);
+        ArgumentNullException.ThrowIfNull(expression);
 
         var fullName = GetFullHtmlFieldName(viewContext, expression);
 

src/GovUk.Frontend.AspNetCore/Guard.cs

@@ -27,7 +27,8 @@ public TagBuilder GenerateAccordion(
         string? showSectionAriaLabelText,
         IEnumerable<AccordionItem> items)
     {
-        Guard.ArgumentNotNullOrEmpty(nameof(id), id);
+        ArgumentNullException.ThrowIfNull(id);
+        ArgumentNullException.ThrowIfNull(items);
 
         if (headingLevel is < AccordionMinHeadingLevel or > AccordionMaxHeadingLevel)
         {
@@ -36,8 +37,6 @@ public TagBuilder GenerateAccordion(
                 $"{nameof(headingLevel)} must be between {AccordionMinHeadingLevel} and {AccordionMaxHeadingLevel}.");
         }
 
-        Guard.ArgumentNotNullOrEmpty(nameof(items), items);
-
         var tagBuilder = new TagBuilder(AccordionElement);
         tagBuilder.MergeOptionalAttributes(attributes);
         tagBuilder.MergeCssClass("govuk-accordion");
@@ -82,18 +81,6 @@ public TagBuilder GenerateAccordion(
         var index = 0;
         foreach (var item in items)
         {
-            Guard.ArgumentValidNotNull(
-                nameof(items),
-                $"Item {index} is not valid; {nameof(AccordionItem.Content)} cannot be null.",
-                item.Content,
-                item.Content is not null);
-
-            Guard.ArgumentValidNotNull(
-                nameof(items),
-                $"Item {index} is not valid; {nameof(AccordionItem.HeadingContent)} cannot be null.",
-                item.HeadingContent,
-                item.HeadingContent is not null);
-
             var idSuffix = index + 1;
 
             var section = new TagBuilder(AccordionItemElement);
@@ -115,7 +102,7 @@ public TagBuilder GenerateAccordion(
             var headingContent = new TagBuilder("span");
             headingContent.MergeCssClass("govuk-accordion__section-button");
             headingContent.Attributes.Add("id", headingId);
-            headingContent.InnerHtml.AppendHtml(item.HeadingContent);
+            headingContent.InnerHtml.AppendHtml(item.HeadingContent!);
             heading.InnerHtml.AppendHtml(headingContent);
             header.InnerHtml.AppendHtml(heading);
 
@@ -138,7 +125,7 @@ public TagBuilder GenerateAccordion(
             contentDiv.MergeCssClass("govuk-accordion__section-content");
             contentDiv.Attributes.Add("id", contentId);
             contentDiv.MergeOptionalAttributes(item.ContentAttributes);
-            contentDiv.InnerHtml.AppendHtml(item.Content);
+            contentDiv.InnerHtml.AppendHtml(item.Content!);
             section.InnerHtml.AppendHtml(contentDiv);
 
             tagBuilder.InnerHtml.AppendHtml(section);

src/GovUk.Frontend.AspNetCore/HtmlGeneration/ComponentGenerator.Accordion.cs

@@ -22,7 +22,7 @@ public TagBuilder GenerateCheckboxes(
         IEnumerable<CheckboxesItemBase> items,
         AttributeDictionary? attributes)
     {
-        Guard.ArgumentNotNull(nameof(items), items);
+        ArgumentNullException.ThrowIfNull(items);
 
         var tagBuilder = new TagBuilder(CheckboxesElement);
         tagBuilder.MergeOptionalAttributes(attributes);
@@ -52,38 +52,16 @@ public TagBuilder GenerateCheckboxes(
 
         void AddDivider(CheckboxesItemDivider divider)
         {
-            Guard.ArgumentValidNotNull(
-                nameof(items),
-                $"Item {itemIndex} is not valid; {nameof(CheckboxesItemDivider.Content)} cannot be null.",
-                divider.Content,
-                divider.Content is not null);
-
             var dividerTagBuilder = new TagBuilder(CheckboxesDividerItemElement);
             dividerTagBuilder.MergeOptionalAttributes(divider.Attributes);
             dividerTagBuilder.MergeCssClass("govuk-checkboxes__divider");
-            dividerTagBuilder.InnerHtml.AppendHtml(divider.Content);
+            dividerTagBuilder.InnerHtml.AppendHtml(divider.Content!);
 
             tagBuilder.InnerHtml.AppendHtml(dividerTagBuilder);
         }
 
         void AddItem(CheckboxesItem item)
         {
-            Guard.ArgumentValidNotNull(
-                nameof(items),
-                $"Item {itemIndex} is not valid; {nameof(CheckboxesItem.Value)} cannot be null.",
-                item.Value,
-                item.Value is not null);
-
-            Guard.ArgumentValid(
-                nameof(items),
-                $"Item {itemIndex} is not valid; {nameof(CheckboxesItem.Name)} cannot be null when {nameof(name)} is null.",
-                item.Name is not null || name is not null);
-
-            Guard.ArgumentValid(
-                nameof(items),
-                $"Item {itemIndex} is not valid; {nameof(CheckboxesItem.Id)} cannot be null when {nameof(idPrefix)} is null.",
-                item.Id is not null || idPrefix is not null);
-
             var itemId = item.Id ?? (itemIndex == 0 ? idPrefix : $"{idPrefix}-{itemIndex + 1}");
             var hintId = itemId + "-item-hint";
             var conditionalId = "conditional-" + itemId;
@@ -146,13 +124,7 @@ void AddItem(CheckboxesItem item)
 
             if (item.Hint is not null)
             {
-                Guard.ArgumentValidNotNull(
-                    nameof(items),
-                    $"Item {itemIndex} is not valid; {nameof(CheckboxesItem.Hint)}.{nameof(CheckboxesItemHint.Content)} cannot be null.",
-                    item.Hint.Content,
-                    item.Hint.Content is not null);
-
-                var hint = GenerateHint(hintId, item.Hint.Content, item.Hint.Attributes);
+                var hint = GenerateHint(hintId, item.Hint.Content!, item.Hint.Attributes);
                 hint.MergeCssClass("govuk-checkboxes__hint");
                 itemTagBuilder.InnerHtml.AppendHtml(hint);
             }
@@ -161,12 +133,6 @@ void AddItem(CheckboxesItem item)
 
             if (item.Conditional is not null)
             {
-                Guard.ArgumentValidNotNull(
-                    nameof(items),
-                    $"Item {itemIndex} is not valid; {nameof(CheckboxesItem.Conditional.Content)} cannot be null.",
-                    item.Conditional.Content,
-                    item.Conditional.Content is not null);
-
                 var conditional = new TagBuilder("div");
                 conditional.MergeOptionalAttributes(item.Conditional.Attributes);
                 conditional.MergeCssClass("govuk-checkboxes__conditional");
@@ -178,7 +144,7 @@ void AddItem(CheckboxesItem item)
 
                 conditional.Attributes.Add("id", conditionalId);
 
-                conditional.InnerHtml.AppendHtml(item.Conditional.Content);
+                conditional.InnerHtml.AppendHtml(item.Conditional.Content!);
 
                 tagBuilder.InnerHtml.AppendHtml(conditional);
             }

src/GovUk.Frontend.AspNetCore/HtmlGeneration/ComponentGenerator.Checkboxes.cs

@@ -19,8 +19,8 @@ public TagBuilder GenerateDetails(
         AttributeDictionary? textAttributes,
         AttributeDictionary? attributes)
     {
-        Guard.ArgumentNotNull(nameof(summaryContent), summaryContent);
-        Guard.ArgumentNotNull(nameof(textContent), textContent);
+        ArgumentNullException.ThrowIfNull(summaryContent);
+        ArgumentNullException.ThrowIfNull(textContent);
 
         var tagBuilder = new TagBuilder(DetailsElement);
         tagBuilder.MergeOptionalAttributes(attributes);

src/GovUk.Frontend.AspNetCore/HtmlGeneration/ComponentGenerator.Details.cs

@@ -14,7 +14,7 @@ public TagBuilder GenerateErrorMessage(
         IHtmlContent content,
         AttributeDictionary? attributes)
     {
-        Guard.ArgumentNotNull(nameof(content), content);
+        ArgumentNullException.ThrowIfNull(content);
 
         var tagBuilder = new TagBuilder(ErrorMessageElement);
         tagBuilder.MergeOptionalAttributes(attributes);

src/GovUk.Frontend.AspNetCore/HtmlGeneration/ComponentGenerator.ErrorMessage.cs

@@ -19,7 +19,7 @@ public TagBuilder GenerateFieldset(
         IHtmlContent content,
         AttributeDictionary? attributes)
     {
-        Guard.ArgumentNotNull(nameof(content), content);
+        ArgumentNullException.ThrowIfNull(content);
 
         var tagBuilder = new TagBuilder(FieldsetElement);
         tagBuilder.MergeOptionalAttributes(attributes);

src/GovUk.Frontend.AspNetCore/HtmlGeneration/ComponentGenerator.Fieldset.cs

@@ -10,7 +10,7 @@ internal partial class ComponentGenerator
 
     public TagBuilder GenerateHint(string? id, IHtmlContent content, AttributeDictionary? attributes)
     {
-        Guard.ArgumentNotNull(nameof(content), content);
+        ArgumentNullException.ThrowIfNull(content);
 
         var tagBuilder = new TagBuilder(HintElement);
         tagBuilder.MergeOptionalAttributes(attributes);

src/GovUk.Frontend.AspNetCore/HtmlGeneration/ComponentGenerator.Hint.cs

@@ -28,7 +28,7 @@ public TagBuilder GenerateNotificationBanner(
         IHtmlContent content,
         AttributeDictionary? attributes)
     {
-        Guard.ArgumentNotNull(nameof(content), content);
+        ArgumentNullException.ThrowIfNull(content);
 
         if (titleHeadingLevel is < NotificationBannerMinHeadingLevel or
             > NotificationBannerMaxHeadingLevel)