Refactor: removed OperationContainer.Kind because IJsonApiRequest.WriteOperation is now populated consistently; applied c# pattern usage

Author: Bart Koelman

src/JsonApiDotNetCore/AtomicOperations/LocalIdValidator.cs

@@ -57,7 +57,7 @@ public void Validate(IEnumerable<OperationContainer> operations)
 
         private void ValidateOperation(OperationContainer operation)
         {
-            if (operation.Kind == WriteOperationKind.CreateResource)
+            if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
             {
                 DeclareLocalId(operation.Resource);
             }
@@ -71,7 +71,7 @@ private void ValidateOperation(OperationContainer operation)
                 AssertLocalIdIsAssigned(secondaryResource);
             }
 
-            if (operation.Kind == WriteOperationKind.CreateResource)
+            if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
             {
                 AssignLocalId(operation);
             }

src/JsonApiDotNetCore/AtomicOperations/OperationProcessorAccessor.cs

@@ -37,7 +37,7 @@ public Task<OperationContainer> ProcessAsync(OperationContainer operation, Cance
 
         protected virtual IOperationProcessor ResolveProcessor(OperationContainer operation)
         {
-            Type processorInterface = GetProcessorInterface(operation.Kind);
+            Type processorInterface = GetProcessorInterface(operation.Request.WriteOperation.GetValueOrDefault());
             ResourceContext resourceContext = _resourceGraph.GetResourceContext(operation.Resource.GetType());
 
             Type processorType = processorInterface.MakeGenericType(resourceContext.ResourceType, resourceContext.IdentityType);

src/JsonApiDotNetCore/AtomicOperations/OperationsProcessor.cs

@@ -115,7 +115,7 @@ protected virtual async Task<OperationContainer> ProcessOperationAsync(Operation
 
         protected void TrackLocalIdsForOperation(OperationContainer operation)
         {
-            if (operation.Kind == WriteOperationKind.CreateResource)
+            if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
             {
                 DeclareLocalId(operation.Resource);
             }

src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs

@@ -57,7 +57,7 @@ private static bool IsId(string key)
 
         private static bool IsAtPrimaryEndpoint(IJsonApiRequest request)
         {
-            return request.Kind == EndpointKind.Primary || request.Kind == EndpointKind.AtomicOperations;
+            return request.Kind is EndpointKind.Primary or EndpointKind.AtomicOperations;
         }
 
         private static bool IsFieldTargeted(ValidationEntry entry, ITargetedFields targetedFields)

src/JsonApiDotNetCore/Controllers/BaseJsonApiOperationsController.cs

@@ -133,7 +133,7 @@ protected virtual void ValidateModelState(IEnumerable<OperationContainer> operat
 
             foreach (OperationContainer operation in operations)
             {
-                if (operation.Kind == WriteOperationKind.CreateResource || operation.Kind == WriteOperationKind.UpdateResource)
+                if (operation.Request.WriteOperation is WriteOperationKind.CreateResource or WriteOperationKind.UpdateResource)
                 {
                     _targetedFields.CopyFrom(operation.TargetedFields);
                     _request.CopyFrom(operation.Request);

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

@@ -49,7 +49,7 @@ private static Expression TryGetCollectionCount(Expression collectionExpression)
 
             foreach (PropertyInfo property in properties)
             {
-                if (property.Name == "Count" || property.Name == "Length")
+                if (property.Name is "Count" or "Length")
                 {
                     return Expression.Property(collectionExpression, property);
                 }

src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs

@@ -45,7 +45,7 @@ public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttr
         /// <inheritdoc />
         public virtual bool CanRead(string parameterName)
         {
-            return parameterName == PageSizeParameterName || parameterName == PageNumberParameterName;
+            return parameterName is PageSizeParameterName or PageNumberParameterName;
         }
 
         /// <inheritdoc />

src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs

@@ -570,7 +570,7 @@ protected virtual async Task SaveChangesAsync(CancellationToken cancellationToke
 
                 await _dbContext.SaveChangesAsync(cancellationToken);
             }
-            catch (Exception exception) when (exception is DbUpdateException || exception is InvalidOperationException)
+            catch (Exception exception) when (exception is DbUpdateException or InvalidOperationException)
             {
                 if (_dbContext.Database.CurrentTransaction != null)
                 {

src/JsonApiDotNetCore/Resources/Internal/RuntimeTypeConverter.cs

@@ -71,8 +71,7 @@ public static object ConvertType(object value, Type type)
                 // https://bradwilson.typepad.com/blog/2008/07/creating-nullab.html
                 return Convert.ChangeType(stringValue, nonNullableType);
             }
-            catch (Exception exception) when (exception is FormatException || exception is OverflowException || exception is InvalidCastException ||
-                exception is ArgumentException)
+            catch (Exception exception) when (exception is FormatException or OverflowException or InvalidCastException or ArgumentException)
             {
                 string runtimeTypeName = runtimeType.GetFriendlyTypeName();
                 string targetTypeName = type.GetFriendlyTypeName();

src/JsonApiDotNetCore/Resources/OperationContainer.cs

@@ -13,18 +13,16 @@ public sealed class OperationContainer
     {
         private static readonly CollectionConverter CollectionConverter = new();
 
-        public WriteOperationKind Kind { get; }
         public IIdentifiable Resource { get; }
         public ITargetedFields TargetedFields { get; }
         public IJsonApiRequest Request { get; }
 
-        public OperationContainer(WriteOperationKind kind, IIdentifiable resource, ITargetedFields targetedFields, IJsonApiRequest request)
+        public OperationContainer(IIdentifiable resource, ITargetedFields targetedFields, IJsonApiRequest request)
         {
             ArgumentGuard.NotNull(resource, nameof(resource));
             ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
             ArgumentGuard.NotNull(request, nameof(request));
 
-            Kind = kind;
             Resource = resource;
             TargetedFields = targetedFields;
             Request = request;
@@ -39,7 +37,7 @@ public OperationContainer WithResource(IIdentifiable resource)
         {
             ArgumentGuard.NotNull(resource, nameof(resource));
 
-            return new OperationContainer(Kind, resource, TargetedFields, Request);
+            return new OperationContainer(resource, TargetedFields, Request);
         }
 
         public ISet<IIdentifiable> GetSecondaryResources()

src/JsonApiDotNetCore/Serialization/JsonApiWriter.cs

@@ -105,7 +105,7 @@ private string SerializeResponse(object contextObject, HttpStatusCode statusCode
                     throw new UnsuccessfulActionResultException(statusCode);
                 }
 
-                if (statusCode == HttpStatusCode.NoContent || statusCode == HttpStatusCode.ResetContent || statusCode == HttpStatusCode.NotModified)
+                if (statusCode is HttpStatusCode.NoContent or HttpStatusCode.ResetContent or HttpStatusCode.NotModified)
                 {
                     // Prevent exception from Kestrel server, caused by writing data:null json response.
                     return null;

src/JsonApiDotNetCore/Serialization/RequestAdapters/AtomicOperationObjectAdapter.cs

@@ -49,12 +49,12 @@ public OperationContainer Convert(AtomicOperationObject atomicOperationObject, R
 
             (ResourceIdentityRequirements requirements, IIdentifiable primaryResource) = ConvertRef(atomicOperationObject, state);
 
-            if (writeOperation == WriteOperationKind.CreateResource || writeOperation == WriteOperationKind.UpdateResource)
+            if (writeOperation is WriteOperationKind.CreateResource or WriteOperationKind.UpdateResource)
             {
                 primaryResource = _resourceDataInOperationsRequestAdapter.Convert(atomicOperationObject.Data, requirements, state);
             }
 
-            return new OperationContainer(writeOperation, primaryResource, state.WritableTargetedFields, state.Request);
+            return new OperationContainer(primaryResource, state.WritableTargetedFields, state.Request);
         }
 
         private static void AssertNoHref(AtomicOperationObject atomicOperationObject, RequestAdapterState state)

src/JsonApiDotNetCore/Serialization/RequestAdapters/ResourceIdentityAdapter.cs

@@ -206,8 +206,7 @@ protected static void AssertIsKnownRelationship(RelationshipAttribute relationsh
 
         protected internal static void AssertToManyInAddOrRemoveRelationship(RelationshipAttribute relationship, RequestAdapterState state)
         {
-            bool requireToManyRelationship = state.Request.WriteOperation == WriteOperationKind.AddToRelationship ||
-                state.Request.WriteOperation == WriteOperationKind.RemoveFromRelationship;
+            bool requireToManyRelationship = state.Request.WriteOperation is WriteOperationKind.AddToRelationship or WriteOperationKind.RemoveFromRelationship;
 
             if (requireToManyRelationship && relationship is not HasManyAttribute)
             {

src/JsonApiDotNetCore/Serialization/ResponseSerializer.cs

@@ -67,7 +67,7 @@ public string Serialize(object content)
         {
             _sparseFieldSetCache.Reset();
 
-            if (content == null || content is IIdentifiable)
+            if (content is null or IIdentifiable)
             {
                 return SerializeSingle((IIdentifiable)content);
             }

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs

@@ -38,7 +38,7 @@ private static void AssertOnlyCreatingMusicTracks(IEnumerable<OperationContainer
 
             foreach (OperationContainer operation in operations)
             {
-                if (operation.Kind != WriteOperationKind.CreateResource || operation.Resource.GetType() != typeof(MusicTrack))
+                if (operation.Request.WriteOperation != WriteOperationKind.CreateResource || operation.Resource.GetType() != typeof(MusicTrack))
                 {
                     throw new JsonApiException(new ErrorObject(HttpStatusCode.UnprocessableEntity)
                     {