Apply Resharper hint: convert switch statement to expression

Author: bkoelman

src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs

@@ -50,27 +50,14 @@ public JsonApiEndpointMetadataContainer Get(MethodInfo controllerAction)
 
     private IJsonApiRequestMetadata? GetRequestMetadata(JsonApiEndpoint endpoint, ResourceType primaryResourceType)
     {
-        switch (endpoint)
+        return endpoint switch
         {
-            case JsonApiEndpoint.Post:
-            {
-                return GetPostRequestMetadata(primaryResourceType.ClrType);
-            }
-            case JsonApiEndpoint.Patch:
-            {
-                return GetPatchRequestMetadata(primaryResourceType.ClrType);
-            }
-            case JsonApiEndpoint.PostRelationship:
-            case JsonApiEndpoint.PatchRelationship:
-            case JsonApiEndpoint.DeleteRelationship:
-            {
-                return GetRelationshipRequestMetadata(primaryResourceType.Relationships, endpoint != JsonApiEndpoint.PatchRelationship);
-            }
-            default:
-            {
-                return null;
-            }
-        }
+            JsonApiEndpoint.Post => GetPostRequestMetadata(primaryResourceType.ClrType),
+            JsonApiEndpoint.Patch => GetPatchRequestMetadata(primaryResourceType.ClrType),
+            JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship => GetRelationshipRequestMetadata(
+                primaryResourceType.Relationships, endpoint != JsonApiEndpoint.PatchRelationship),
+            _ => null
+        };
     }
 
     private static PrimaryRequestMetadata GetPostRequestMetadata(Type resourceClrType)
@@ -99,28 +86,14 @@ private RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable<R
 
     private IJsonApiResponseMetadata? GetResponseMetadata(JsonApiEndpoint endpoint, ResourceType primaryResourceType)
     {
-        switch (endpoint)
+        return endpoint switch
         {
-            case JsonApiEndpoint.GetCollection:
-            case JsonApiEndpoint.GetSingle:
-            case JsonApiEndpoint.Post:
-            case JsonApiEndpoint.Patch:
-            {
-                return GetPrimaryResponseMetadata(primaryResourceType.ClrType, endpoint == JsonApiEndpoint.GetCollection);
-            }
-            case JsonApiEndpoint.GetSecondary:
-            {
-                return GetSecondaryResponseMetadata(primaryResourceType.Relationships);
-            }
-            case JsonApiEndpoint.GetRelationship:
-            {
-                return GetRelationshipResponseMetadata(primaryResourceType.Relationships);
-            }
-            default:
-            {
-                return null;
-            }
-        }
+            JsonApiEndpoint.GetCollection or JsonApiEndpoint.GetSingle or JsonApiEndpoint.Post or JsonApiEndpoint.Patch => GetPrimaryResponseMetadata(
+                primaryResourceType.ClrType, endpoint == JsonApiEndpoint.GetCollection),
+            JsonApiEndpoint.GetSecondary => GetSecondaryResponseMetadata(primaryResourceType.Relationships),
+            JsonApiEndpoint.GetRelationship => GetRelationshipResponseMetadata(primaryResourceType.Relationships),
+            _ => null
+        };
     }
 
     private static PrimaryResponseMetadata GetPrimaryResponseMetadata(Type resourceClrType, bool endpointReturnsCollection)

src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs

@@ -105,49 +105,28 @@ private void SetResponseMetadata(ActionModel action, JsonApiEndpoint endpoint)
 
     private static IList<int> GetStatusCodesForEndpoint(JsonApiEndpoint endpoint)
     {
-        switch (endpoint)
+        return endpoint switch
         {
-            case JsonApiEndpoint.GetCollection:
-            case JsonApiEndpoint.GetSingle:
-            case JsonApiEndpoint.GetSecondary:
-            case JsonApiEndpoint.GetRelationship:
+            JsonApiEndpoint.GetCollection or JsonApiEndpoint.GetSingle or JsonApiEndpoint.GetSecondary or JsonApiEndpoint.GetRelationship => new[]
             {
-                return new[]
-                {
-                    StatusCodes.Status200OK
-                };
-            }
-            case JsonApiEndpoint.Post:
+                StatusCodes.Status200OK
+            },
+            JsonApiEndpoint.Post => new[]
             {
-                return new[]
-                {
-                    StatusCodes.Status201Created,
-                    StatusCodes.Status204NoContent
-                };
-            }
-            case JsonApiEndpoint.Patch:
+                StatusCodes.Status201Created,
+                StatusCodes.Status204NoContent
+            },
+            JsonApiEndpoint.Patch => new[]
             {
-                return new[]
-                {
-                    StatusCodes.Status200OK,
-                    StatusCodes.Status204NoContent
-                };
-            }
-            case JsonApiEndpoint.Delete:
-            case JsonApiEndpoint.PostRelationship:
-            case JsonApiEndpoint.PatchRelationship:
-            case JsonApiEndpoint.DeleteRelationship:
+                StatusCodes.Status200OK,
+                StatusCodes.Status204NoContent
+            },
+            JsonApiEndpoint.Delete or JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship => new[]
             {
-                return new[]
-                {
-                    StatusCodes.Status204NoContent
-                };
-            }
-            default:
-            {
-                throw new UnreachableCodeException();
-            }
-        }
+                StatusCodes.Status204NoContent
+            },
+            _ => throw new UnreachableCodeException()
+        };
     }
 
     private static void SetRequestMetadata(ActionModel action, JsonApiEndpoint endpoint)

test/OpenApiClientTests/FakerFactory.cs

@@ -54,22 +54,13 @@ public override void Generate(AutoGenerateOverrideContext context)
 
         private static object ToPositiveValue(object idValue)
         {
-            if (idValue is short shortValue)
+            return idValue switch
             {
-                return Math.Abs(shortValue);
-            }
-
-            if (idValue is int intValue)
-            {
-                return Math.Abs(intValue);
-            }
-
-            if (idValue is long longValue)
-            {
-                return Math.Abs(longValue);
-            }
-
-            return idValue;
+                short shortValue => Math.Abs(shortValue),
+                int intValue => Math.Abs(intValue),
+                long longValue => Math.Abs(longValue),
+                _ => idValue
+            };
         }
 
         [UsedImplicitly(ImplicitUseTargetFlags.Members)]