Apply Resharper hint: convert switch statement to expression

Author: bkoelman

src/JsonApiDotNetCore.SourceGenerators/SourceCodeWriter.cs

@@ -130,21 +130,12 @@ private void WriteOpenClassDeclaration(string controllerName, JsonApiEndpointsCo
 
     private static string GetControllerBaseClassName(JsonApiEndpointsCopy endpointsToGenerate)
     {
-        switch (endpointsToGenerate)
+        return endpointsToGenerate switch
         {
-            case JsonApiEndpointsCopy.Query:
-            {
-                return "JsonApiQueryController";
-            }
-            case JsonApiEndpointsCopy.Command:
-            {
-                return "JsonApiCommandController";
-            }
-            default:
-            {
-                return "JsonApiController";
-            }
-        }
+            JsonApiEndpointsCopy.Query => "JsonApiQueryController",
+            JsonApiEndpointsCopy.Command => "JsonApiCommandController",
+            _ => "JsonApiController"
+        };
     }
 
     private void WriteConstructor(string controllerName, INamedTypeSymbol loggerFactoryInterface, JsonApiEndpointsCopy endpointsToGenerate,

src/JsonApiDotNetCore/AtomicOperations/OperationProcessorAccessor.cs

@@ -40,36 +40,15 @@ protected virtual IOperationProcessor ResolveProcessor(OperationContainer operat
 
     private static Type GetProcessorInterface(WriteOperationKind writeOperation)
     {
-        switch (writeOperation)
+        return writeOperation switch
         {
-            case WriteOperationKind.CreateResource:
-            {
-                return typeof(ICreateProcessor<,>);
-            }
-            case WriteOperationKind.UpdateResource:
-            {
-                return typeof(IUpdateProcessor<,>);
-            }
-            case WriteOperationKind.DeleteResource:
-            {
-                return typeof(IDeleteProcessor<,>);
-            }
-            case WriteOperationKind.SetRelationship:
-            {
-                return typeof(ISetRelationshipProcessor<,>);
-            }
-            case WriteOperationKind.AddToRelationship:
-            {
-                return typeof(IAddToRelationshipProcessor<,>);
-            }
-            case WriteOperationKind.RemoveFromRelationship:
-            {
-                return typeof(IRemoveFromRelationshipProcessor<,>);
-            }
-            default:
-            {
-                throw new NotSupportedException($"Unknown write operation kind '{writeOperation}'.");
-            }
-        }
+            WriteOperationKind.CreateResource => typeof(ICreateProcessor<,>),
+            WriteOperationKind.UpdateResource => typeof(IUpdateProcessor<,>),
+            WriteOperationKind.DeleteResource => typeof(IDeleteProcessor<,>),
+            WriteOperationKind.SetRelationship => typeof(ISetRelationshipProcessor<,>),
+            WriteOperationKind.AddToRelationship => typeof(IAddToRelationshipProcessor<,>),
+            WriteOperationKind.RemoveFromRelationship => typeof(IRemoveFromRelationshipProcessor<,>),
+            _ => throw new NotSupportedException($"Unknown write operation kind '{writeOperation}'.")
+        };
     }
 }

src/JsonApiDotNetCore/Middleware/ExceptionHandler.cs

@@ -71,15 +71,19 @@ protected virtual IReadOnlyList<ErrorObject> CreateErrorResponse(Exception excep
     {
         ArgumentGuard.NotNull(exception);
 
-        IReadOnlyList<ErrorObject> errors = exception is JsonApiException jsonApiException ? jsonApiException.Errors :
-            exception is OperationCanceledException ? new ErrorObject((HttpStatusCode)499)
+        IReadOnlyList<ErrorObject> errors = exception switch
+        {
+            JsonApiException jsonApiException => jsonApiException.Errors,
+            OperationCanceledException => new ErrorObject((HttpStatusCode)499)
             {
                 Title = "Request execution was canceled."
-            }.AsArray() : new ErrorObject(HttpStatusCode.InternalServerError)
+            }.AsArray(),
+            _ => new ErrorObject(HttpStatusCode.InternalServerError)
             {
                 Title = "An unhandled error occurred while processing this request.",
                 Detail = exception.Message
-            }.AsArray();
+            }.AsArray()
+        };
 
         if (_options.IncludeExceptionStackTraceInErrors && exception is not InvalidModelStateException)
         {

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs

@@ -191,31 +191,15 @@ public override Expression VisitComparison(ComparisonExpression expression, obje
         Expression left = WrapInConvert(Visit(expression.Left, argument), commonType);
         Expression right = WrapInConvert(Visit(expression.Right, argument), commonType);
 
-        switch (expression.Operator)
+        return expression.Operator switch
         {
-            case ComparisonOperator.Equals:
-            {
-                return Expression.Equal(left, right);
-            }
-            case ComparisonOperator.LessThan:
-            {
-                return Expression.LessThan(left, right);
-            }
-            case ComparisonOperator.LessOrEqual:
-            {
-                return Expression.LessThanOrEqual(left, right);
-            }
-            case ComparisonOperator.GreaterThan:
-            {
-                return Expression.GreaterThan(left, right);
-            }
-            case ComparisonOperator.GreaterOrEqual:
-            {
-                return Expression.GreaterThanOrEqual(left, right);
-            }
-        }
-
-        throw new InvalidOperationException($"Unknown comparison operator '{expression.Operator}'.");
+            ComparisonOperator.Equals => Expression.Equal(left, right),
+            ComparisonOperator.LessThan => Expression.LessThan(left, right),
+            ComparisonOperator.LessOrEqual => Expression.LessThanOrEqual(left, right),
+            ComparisonOperator.GreaterThan => Expression.GreaterThan(left, right),
+            ComparisonOperator.GreaterOrEqual => Expression.GreaterThanOrEqual(left, right),
+            _ => throw new InvalidOperationException($"Unknown comparison operator '{expression.Operator}'.")
+        };
     }
 
     private Type ResolveCommonType(QueryExpression left, QueryExpression right)

src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs

@@ -347,21 +347,12 @@ private NavigationEntry GetNavigationEntry(TResource resource, RelationshipAttri
     {
         EntityEntry<TResource> entityEntry = _dbContext.Entry(resource);
 
-        switch (relationship)
+        return relationship switch
         {
-            case HasOneAttribute hasOneRelationship:
-            {
-                return entityEntry.Reference(hasOneRelationship.Property.Name);
-            }
-            case HasManyAttribute hasManyRelationship:
-            {
-                return entityEntry.Collection(hasManyRelationship.Property.Name);
-            }
-            default:
-            {
-                throw new InvalidOperationException($"Unknown relationship type '{relationship.GetType().Name}'.");
-            }
-        }
+            HasOneAttribute hasOneRelationship => entityEntry.Reference(hasOneRelationship.Property.Name),
+            HasManyAttribute hasManyRelationship => entityEntry.Collection(hasManyRelationship.Property.Name),
+            _ => throw new InvalidOperationException($"Unknown relationship type '{relationship.GetType().Name}'.")
+        };
     }
 
     private bool RequiresLoadOfRelationshipForDeletion(RelationshipAttribute relationship)