Resharper: convert to switch expression

bkoelman · bkoelman · commit 2aecb1755735 · 2023-11-22T00:48:53.000+01:00
diff --git a/src/JsonApiDotNetCore.Annotations/CollectionConverter.cs b/src/JsonApiDotNetCore.Annotations/CollectionConverter.cs
@@ -68,32 +68,15 @@ private Type ToConcreteCollectionType(Type collectionType)
     /// </summary>
     public IReadOnlyCollection<IIdentifiable> ExtractResources(object? value)
     {
-        if (value is List<IIdentifiable> resourceList)
+        return value switch
         {
-            return resourceList;
-        }
-
-        if (value is HashSet<IIdentifiable> resourceSet)
-        {
-            return resourceSet;
-        }
-
-        if (value is IReadOnlyCollection<IIdentifiable> resourceCollection)
-        {
-            return resourceCollection;
-        }
-
-        if (value is IEnumerable<IIdentifiable> resources)
-        {
-            return resources.ToList();
-        }
-
-        if (value is IIdentifiable resource)
-        {
-            return resource.AsArray();
-        }
-
-        return Array.Empty<IIdentifiable>();
+            List<IIdentifiable> resourceList => resourceList,
+            HashSet<IIdentifiable> resourceSet => resourceSet,
+            IReadOnlyCollection<IIdentifiable> resourceCollection => resourceCollection,
+            IEnumerable<IIdentifiable> resources => resources.ToList(),
+            IIdentifiable resource => resource.AsArray(),
+            _ => Array.Empty<IIdentifiable>()
+        };
     }
 
     /// <summary>
diff --git a/src/JsonApiDotNetCore/Queries/QueryableBuilding/WhereClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/QueryableBuilding/WhereClauseBuilder.cs
@@ -100,17 +100,12 @@ public override Expression VisitMatchText(MatchTextExpression expression, QueryC
 
         Expression text = Visit(expression.TextValue, context);
 
-        if (expression.MatchKind == TextMatchKind.StartsWith)
+        return expression.MatchKind switch
         {
-            return Expression.Call(property, "StartsWith", null, text);
-        }
-
-        if (expression.MatchKind == TextMatchKind.EndsWith)
-        {
-            return Expression.Call(property, "EndsWith", null, text);
-        }
-
-        return Expression.Call(property, "Contains", null, text);
+            TextMatchKind.StartsWith => Expression.Call(property, "StartsWith", null, text),
+            TextMatchKind.EndsWith => Expression.Call(property, "EndsWith", null, text),
+            _ => Expression.Call(property, "Contains", null, text)
+        };
     }
 
     public override Expression VisitAny(AnyExpression expression, QueryClauseBuilderContext context)
@@ -137,17 +132,12 @@ public override Expression VisitLogical(LogicalExpression expression, QueryClaus
     {
         var termQueue = new Queue<Expression>(expression.Terms.Select(filter => Visit(filter, context)));
 
-        if (expression.Operator == LogicalOperator.And)
-        {
-            return Compose(termQueue, Expression.AndAlso);
-        }
-
-        if (expression.Operator == LogicalOperator.Or)
+        return expression.Operator switch
         {
-            return Compose(termQueue, Expression.OrElse);
-        }
-
-        throw new InvalidOperationException($"Unknown logical operator '{expression.Operator}'.");
+            LogicalOperator.And => Compose(termQueue, Expression.AndAlso),
+            LogicalOperator.Or => Compose(termQueue, Expression.OrElse),
+            _ => throw new InvalidOperationException($"Unknown logical operator '{expression.Operator}'.")
+        };
     }
 
     private static BinaryExpression Compose(Queue<Expression> argumentQueue, Func<Expression, Expression, BinaryExpression> applyOperator)
