json-api-dotnet#1

Author: verdie-g

src/JsonApiDotNetCore/Controllers/Annotations/DisableQueryStringAttribute.cs

@@ -53,7 +53,7 @@ public DisableQueryStringAttribute(string parameterNames)
 
     public bool ContainsParameter(JsonApiQueryStringParameters parameter)
     {
-        string name = parameter.ToString();
+        string name = parameter.ToString(); // TODO: avoid allocation
         return ParameterNames.Contains(name);
     }
 }

src/JsonApiDotNetCore/QueryStrings/FilterQueryStringParameterReader.cs

@@ -59,30 +59,32 @@ public virtual bool CanRead(string parameterName)
     /// <inheritdoc />
     public virtual void Read(string parameterName, StringValues parameterValue)
     {
-        foreach (string value in parameterValue.SelectMany(ExtractParameterValue))
+        foreach (string? value in parameterValue)
         {
-            ReadSingleValue(parameterName, value);
-        }
-    }
+            if (value == null)
+            {
+                continue;
+            }
 
-    private IEnumerable<string> ExtractParameterValue(string? parameterValue)
-    {
-        if (parameterValue != null)
-        {
-            if (_options.EnableLegacyFilterNotation)
+            if (!_options.EnableLegacyFilterNotation)
             {
-                foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
-                {
-                    yield return condition;
-                }
+                ReadSingleValue(parameterName, value);
             }
             else
             {
-                yield return parameterValue;
+                ReadLegacyValues(parameterName, value);
             }
         }
     }
 
+    private void ReadLegacyValues(string parameterName, string parameterValue)
+    {
+        foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
+        {
+            ReadSingleValue(parameterName, condition);
+        }
+    }
+
     private void ReadSingleValue(string parameterName, string parameterValue)
     {
         bool parameterNameIsValid = false;

src/JsonApiDotNetCore/QueryStrings/QueryStringReader.cs

@@ -42,7 +42,10 @@ public void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute)
 
             if (reader != null)
             {
-                _logger.LogDebug($"Query string parameter '{parameterName}' with value '{parameterValue}' was accepted by {reader.GetType().Name}.");
+                if (_logger.IsEnabled(LogLevel.Debug))
+                {
+                    _logger.LogDebug($"Query string parameter '{parameterName}' with value '{parameterValue}' was accepted by {reader.GetType().Name}.");
+                }
 
                 if (!reader.AllowEmptyValue && string.IsNullOrEmpty(parameterValue))
                 {
@@ -58,7 +61,11 @@ public void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute)
                 }
 
                 reader.Read(parameterName, parameterValue);
-                _logger.LogDebug($"Query string parameter '{parameterName}' was successfully read.");
+
+                if (_logger.IsEnabled(LogLevel.Debug))
+                {
+                    _logger.LogDebug($"Query string parameter '{parameterName}' was successfully read.");
+                }
             }
             else if (!_options.AllowUnknownQueryStringParameters)
             {