Review/update ArgumentGuard usages:

- Logger category name can consist of whitespace
- Assembly/type/member name can NOT consist of whitespace
- JSON:API field name can NOT consist of whitespace

Author: bkoelman

src/Examples/DapperExample/TranslationToSql/Builders/DeleteOneToOneStatementBuilder.cs

@@ -11,7 +11,7 @@ internal sealed class DeleteOneToOneStatementBuilder(IDataModelService dataModel
     public DeleteNode Build(ResourceType resourceType, string whereColumnName, object? whereValue)
     {
         ArgumentGuard.NotNull(resourceType);
-        ArgumentGuard.NotNull(whereColumnName);
+        ArgumentGuard.NotNullNorEmpty(whereColumnName);
 
         ResetState();
 

src/Examples/DapperExample/TranslationToSql/Builders/UpdateClearOneToOneStatementBuilder.cs

@@ -11,8 +11,8 @@ internal sealed class UpdateClearOneToOneStatementBuilder(IDataModelService data
     public UpdateNode Build(ResourceType resourceType, string setColumnName, string whereColumnName, object? whereValue)
     {
         ArgumentGuard.NotNull(resourceType);
-        ArgumentGuard.NotNull(setColumnName);
-        ArgumentGuard.NotNull(whereColumnName);
+        ArgumentGuard.NotNullNorEmpty(setColumnName);
+        ArgumentGuard.NotNullNorEmpty(whereColumnName);
 
         ResetState();
 

src/Examples/DapperExample/TranslationToSql/TreeNodes/ParameterNode.cs

@@ -16,7 +16,7 @@ internal sealed class ParameterNode : SqlValueNode
 
     public ParameterNode(string name, object? value)
     {
-        ArgumentGuard.NotNull(name);
+        ArgumentGuard.NotNullNorEmpty(name);
 
         if (!name.StartsWith('@') || name.Length < 2)
         {

src/JsonApiDotNetCore.Annotations/ArgumentGuard.cs

@@ -30,11 +30,30 @@ public static void NotNullNorEmpty<T>([SysNotNull] IEnumerable<T>? value, [Calle
     [AssertionMethod]
     public static void NotNullNorEmpty([SysNotNull] string? value, [CallerArgumentExpression(nameof(value))] string? parameterName = null)
     {
+#if !NET6_0
+        ArgumentException.ThrowIfNullOrEmpty(value, parameterName);
+#else
         ArgumentNullException.ThrowIfNull(value, parameterName);
 
         if (value.Length == 0)
         {
             throw new ArgumentException("String cannot be null or empty.", parameterName);
         }
+#endif
+    }
+
+    [AssertionMethod]
+    public static void NotNullNorWhitespace([SysNotNull] string? value, [CallerArgumentExpression(nameof(value))] string? parameterName = null)
+    {
+#if !NET6_0
+        ArgumentException.ThrowIfNullOrWhiteSpace(value, parameterName);
+#else
+        ArgumentNullException.ThrowIfNull(value, parameterName);
+
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            throw new ArgumentException("String cannot be null, empty, or whitespace.", parameterName);
+        }
+#endif
     }
 }

src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs

@@ -111,7 +111,7 @@ public ResourceType(string publicName, ClientIdGenerationMode? clientIdGeneratio
         IReadOnlyCollection<EagerLoadAttribute>? eagerLoads, LinkTypes topLevelLinks = LinkTypes.NotConfigured,
         LinkTypes resourceLinks = LinkTypes.NotConfigured, LinkTypes relationshipLinks = LinkTypes.NotConfigured)
     {
-        ArgumentGuard.NotNullNorEmpty(publicName);
+        ArgumentGuard.NotNullNorWhitespace(publicName);
         ArgumentGuard.NotNull(clrType);
         ArgumentGuard.NotNull(identityClrType);
 

src/JsonApiDotNetCore/Errors/MissingResourceInRelationship.cs

@@ -11,9 +11,9 @@ public sealed class MissingResourceInRelationship
 
     public MissingResourceInRelationship(string relationshipName, string resourceType, string resourceId)
     {
-        ArgumentGuard.NotNullNorEmpty(relationshipName);
-        ArgumentGuard.NotNullNorEmpty(resourceType);
-        ArgumentGuard.NotNullNorEmpty(resourceId);
+        ArgumentGuard.NotNull(relationshipName);
+        ArgumentGuard.NotNull(resourceType);
+        ArgumentGuard.NotNull(resourceId);
 
         RelationshipName = relationshipName;
         ResourceType = resourceType;

src/JsonApiDotNetCore/Queries/Parsing/FilterParser.cs

@@ -179,7 +179,7 @@ protected virtual NotExpression ParseNot()
 
     protected virtual LogicalExpression ParseLogical(string operatorName)
     {
-        ArgumentGuard.NotNull(operatorName);
+        ArgumentGuard.NotNullNorEmpty(operatorName);
 
         EatText(operatorName);
         EatSingleCharacterToken(TokenKind.OpenParen);
@@ -210,7 +210,7 @@ protected virtual LogicalExpression ParseLogical(string operatorName)
 
     protected virtual ComparisonExpression ParseComparison(string operatorName)
     {
-        ArgumentGuard.NotNull(operatorName);
+        ArgumentGuard.NotNullNorEmpty(operatorName);
 
         var comparisonOperator = Enum.Parse<ComparisonOperator>(operatorName.Pascalize());
 
@@ -315,7 +315,7 @@ private QueryExpression ParseTypedComparisonRightTerm(Type leftType, ConstantVal
 
     protected virtual MatchTextExpression ParseTextMatch(string operatorName)
     {
-        ArgumentGuard.NotNull(operatorName);
+        ArgumentGuard.NotNullNorEmpty(operatorName);
 
         EatText(operatorName);
         EatSingleCharacterToken(TokenKind.OpenParen);

src/JsonApiDotNetCore/QueryStrings/IncludeQueryStringParameterReader.cs

@@ -39,6 +39,8 @@ public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttr
     /// <inheritdoc />
     public virtual bool CanRead(string parameterName)
     {
+        ArgumentGuard.NotNullNorEmpty(parameterName);
+
         return parameterName == "include";
     }
 

src/JsonApiDotNetCore/QueryStrings/PaginationQueryStringParameterReader.cs

@@ -49,6 +49,8 @@ public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttr
     /// <inheritdoc />
     public virtual bool CanRead(string parameterName)
     {
+        ArgumentGuard.NotNullNorEmpty(parameterName);
+
         return parameterName is PageSizeParameterName or PageNumberParameterName;
     }
 

src/JsonApiDotNetCore/QueryStrings/ResourceDefinitionQueryableParameterReader.cs

@@ -37,6 +37,8 @@ public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttr
     /// <inheritdoc />
     public virtual bool CanRead(string parameterName)
     {
+        ArgumentGuard.NotNullNorEmpty(parameterName);
+
         if (_request.Kind == EndpointKind.AtomicOperations)
         {
             return false;

src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterPosition.cs

@@ -21,7 +21,7 @@ public RequestAdapterPosition()
 
     public IDisposable PushElement(string name)
     {
-        ArgumentGuard.NotNullNorEmpty(name);
+        ArgumentGuard.NotNullNorWhitespace(name);
 
         _stack.Push($"/{name}");
         return _disposable;

src/JsonApiDotNetCore/Serialization/Request/JsonInvalidAttributeInfo.cs

@@ -16,7 +16,7 @@ internal sealed class JsonInvalidAttributeInfo
 
     public JsonInvalidAttributeInfo(string attributeName, Type attributeType, string? jsonValue, JsonValueKind jsonType)
     {
-        ArgumentGuard.NotNullNorEmpty(attributeName);
+        ArgumentGuard.NotNull(attributeName);
         ArgumentGuard.NotNull(attributeType);
 
         AttributeName = attributeName;

test/TestBuildingBlocks/CapturingLoggerProvider.cs

@@ -32,7 +32,7 @@ public CapturingLoggerProvider(Func<string, LogLevel, bool> filter)
 
     public ILogger CreateLogger(string categoryName)
     {
-        ArgumentGuard.NotNull(categoryName);
+        ArgumentGuard.NotNullNorEmpty(categoryName);
 
         return new CapturingLogger(this, categoryName, _filter);
     }

test/TestBuildingBlocks/XUnitLoggerProvider.cs

@@ -24,7 +24,7 @@ public XUnitLoggerProvider(ITestOutputHelper testOutputHelper, string? categoryP
 
     public ILogger CreateLogger(string categoryName)
     {
-        ArgumentGuard.NotNull(categoryName);
+        ArgumentGuard.NotNullNorEmpty(categoryName);
 
         if (_categoryPrefixFilter == null || categoryName.StartsWith(_categoryPrefixFilter, StringComparison.Ordinal))
         {