use pattern expression

6bee · Dec 20, 2023 · 8510c63 · 8510c63
1 parent 948a774
commit 8510c63
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/src/Remote.Linq.EntityFramework/ExpressionExecution/EntityFrameworkExpressionExecutor`1.cs b/src/Remote.Linq.EntityFramework/ExpressionExecution/EntityFrameworkExpressionExecutor`1.cs
@@ -73,7 +73,7 @@ protected override SystemLinq.Expression PrepareAsyncQuery(SystemLinq.Expression
                     .ToArray();
             }
 
-            if (resultType.Length != 1)
+            if (resultType.Length is not 1)
             {
                 throw new RemoteLinqException($"Failed to retrieve the result type for async query result {task.GetType()}");
             }

diff --git a/...e.Linq.EntityFrameworkCore/ExpressionExecution/EntityFrameworkCoreExpressionExecutor`1.cs b/...e.Linq.EntityFrameworkCore/ExpressionExecution/EntityFrameworkCoreExpressionExecutor`1.cs
@@ -69,7 +69,7 @@ protected override SystemLinq.Expression PrepareAsyncQuery(SystemLinq.Expression
                     .ToArray();
             }
 
-            if (resultType.Length != 1)
+            if (resultType.Length is not 1)
             {
                 throw new RemoteLinqException($"Failed to retrieve the result type for async query result {task.GetType()}");
             }

diff --git a/src/Remote.Linq.Newtonsoft.Json/Converters/VariableQueryArgumentListConverter.cs b/src/Remote.Linq.Newtonsoft.Json/Converters/VariableQueryArgumentListConverter.cs
@@ -30,13 +30,13 @@ void SetResult(List<object?>? values = null)
         elementTypeInfo = reader.Read<TypeInfo>(serializer) ?? throw reader.CreateException($"{nameof(VariableQueryArgumentList.ElementType)} must not be null.");
 
         reader.Advance();
-        if (reader.TokenType == JsonToken.Null)
+        if (reader.TokenType is JsonToken.Null)
         {
             SetResult();
             return;
         }
 
-        if (reader.TokenType != JsonToken.StartArray)
+        if (reader.TokenType is not JsonToken.StartArray)
         {
             throw reader.CreateException($"Expected array");
         }
@@ -45,7 +45,7 @@ bool TryReadNextItem(out object? value)
         {
             if (!reader.TryRead(elementTypeInfo!, serializer, out value))
             {
-                if (reader.TokenType == JsonToken.EndArray)
+                if (reader.TokenType is JsonToken.EndArray)
                 {
                     return false;
                 }

diff --git a/src/Remote.Linq.Text.Json/Converters/VariableQueryArgumentListConverter.cs b/src/Remote.Linq.Text.Json/Converters/VariableQueryArgumentListConverter.cs
@@ -29,13 +29,13 @@ void SetResult(ref Utf8JsonReader reader, List<object?>? values = null)
         }
 
         reader.Advance();
-        if (reader.TokenType == JsonTokenType.Null)
+        if (reader.TokenType is JsonTokenType.Null)
         {
             SetResult(ref reader);
             return;
         }
 
-        if (reader.TokenType != JsonTokenType.StartArray)
+        if (reader.TokenType is not JsonTokenType.StartArray)
         {
             throw reader.CreateException($"Expected array");
         }
@@ -44,7 +44,7 @@ bool TryReadNextItem(ref Utf8JsonReader reader, out object? value)
         {
             if (!reader.TryRead(elementTypeInfo, options, out value))
             {
-                if (reader.TokenType == JsonTokenType.EndArray)
+                if (reader.TokenType is JsonTokenType.EndArray)
                 {
                     return false;
                 }

diff --git a/src/Remote.Linq/Async/AsyncQueryableExtensions.cs b/src/Remote.Linq/Async/AsyncQueryableExtensions.cs
@@ -421,7 +421,7 @@ private static async ValueTask<TResult> ExecuteAsync<TSource, TResult>(System.Re
                 throw new RemoteLinqException("Implementation error: expected closed generic method definition.");
             }
 
-            method = genericArgumentCount == 2
+            method = genericArgumentCount is 2
                 ? method.MakeGenericMethod(typeof(TSource), typeof(TResult))
                 : method.MakeGenericMethod(typeof(TSource));
         }

diff --git a/src/Remote.Linq/DynamicQuery/DynamicResultMapper.cs b/src/Remote.Linq/DynamicQuery/DynamicResultMapper.cs
@@ -67,12 +67,12 @@ internal static TResult MapToType<TResult>(DynamicObject? dataRecords, IDynamicO
         {
             // handle special case of single item query from too small or too large result set.
             var properties = dataRecords.Properties;
-            if (properties?.Count == 1)
+            if (properties?.Count is 1)
             {
                 var p = properties.Single();
                 if (string.IsNullOrEmpty(p.Name) && p.Value is object[] objectArray)
                 {
-                    if (objectArray.Length == 0)
+                    if (objectArray.Length is 0)
                     {
                         return Enumerable.Empty<TResult>();
                     }
@@ -91,7 +91,7 @@ internal static TResult MapToType<TResult>(DynamicObject? dataRecords, IDynamicO
     [return: MaybeNull]
     internal static TResult MapToSingleResult<TResult>(Type elementType, System.Collections.IEnumerable result, MethodCallExpression methodCallExpression)
     {
-        var hasPredicate = methodCallExpression.Arguments.Count == 2;
+        var hasPredicate = methodCallExpression.Arguments.Count is 2;
         var arguments = hasPredicate
             ? new object[] { result, GetTruePredicate(elementType) }
             : new object[] { result };

diff --git a/src/Remote.Linq/DynamicQuery/ExpressionHelper.cs b/src/Remote.Linq/DynamicQuery/ExpressionHelper.cs
@@ -28,7 +28,7 @@ public static void CheckExpressionResultType<TResult>(SystemExpression expressio
         }
 
         if (expressionType.Implements(typeof(IQueryable<>), out var typeArgs) &&
-            typeArgs.Length == 1 &&
+            typeArgs.Length is 1 &&
             typeof(TResult).IsAssignableFrom(typeArgs[0]))
         {
             return;

diff --git a/src/Remote.Linq/Expressions/LambdaExpression.cs b/src/Remote.Linq/Expressions/LambdaExpression.cs
@@ -48,7 +48,7 @@ public LambdaExpression(Type? type, Expression expression, IEnumerable<Parameter
     public override string ToString()
     {
         var parameters = Parameters;
-        var (open, close) = parameters?.Count == 1 ? (null, null) : ("(", ")");
+        var (open, close) = parameters?.Count is 1 ? (null, null) : ("(", ")");
         var parameterList = parameters.StringJoin(", ");
         return $"{open}{parameterList}{close} => {Expression}";
     }

diff --git a/src/Remote.Linq/Include/SystemIncludeExpressionReWriter.cs b/src/Remote.Linq/Include/SystemIncludeExpressionReWriter.cs
@@ -312,7 +312,7 @@ methodCallExpression.Arguments[1] is LambdaExpression lambdaExpression &&
 
         private static Expression RemoveConvert(Expression expression)
         {
-            while (expression.NodeType == ExpressionType.Convert || expression.NodeType == ExpressionType.ConvertChecked)
+            while (expression.NodeType is ExpressionType.Convert or ExpressionType.ConvertChecked)
             {
                 expression = ((UnaryExpression)expression).Operand;
             }

diff --git a/src/Remote.Linq/SimpleQuery/Query.cs b/src/Remote.Linq/SimpleQuery/Query.cs
@@ -82,7 +82,7 @@ public IQuery Where(LambdaExpression predicate)
     /// </summary>
     public IOrderedQuery OrderBy(SortExpression sortExpression)
     {
-        if (sortExpression.CheckNotNull().SortDirection != SortDirection.Ascending)
+        if (sortExpression.CheckNotNull().SortDirection is not SortDirection.Ascending)
         {
             throw new ArgumentException("Expected sort expresson to be ascending.");
         }
@@ -96,7 +96,7 @@ public IOrderedQuery OrderBy(SortExpression sortExpression)
     /// </summary>
     public IOrderedQuery OrderByDescending(SortExpression sortExpression)
     {
-        if (sortExpression.CheckNotNull().SortDirection != SortDirection.Descending)
+        if (sortExpression.CheckNotNull().SortDirection is not SortDirection.Descending)
         {
             throw new ArgumentException("Expected sort expresson to be descending.");
         }
@@ -112,12 +112,12 @@ public IOrderedQuery OrderByDescending(SortExpression sortExpression)
     /// <returns>A new query instance containing all specified query parameters.</returns>
     IOrderedQuery IOrderedQuery.ThenBy(SortExpression sortExpression)
     {
-        if (SortExpressions?.Any() != true)
+        if (SortExpressions?.Any() is not true)
         {
             throw new InvalidOperationException("No sorting defined yet, use OrderBy or OrderByDescending first.");
         }
 
-        if (sortExpression.SortDirection != SortDirection.Ascending)
+        if (sortExpression.SortDirection is not SortDirection.Ascending)
         {
             throw new ArgumentException("Expected sort expresson to be ascending.");
         }
@@ -136,12 +136,12 @@ IOrderedQuery IOrderedQuery.ThenBy(SortExpression sortExpression)
     /// <returns>A new query instance containing all specified query parameters.</returns>
     IOrderedQuery IOrderedQuery.ThenByDescending(SortExpression sortExpression)
     {
-        if (SortExpressions?.Any() != true)
+        if (SortExpressions?.Any() is not true)
         {
             throw new InvalidOperationException("No sorting defined yet, use OrderBy or OrderByDescending first.");
         }
 
-        if (sortExpression.SortDirection != SortDirection.Descending)
+        if (sortExpression.SortDirection is not SortDirection.Descending)
         {
             throw new ArgumentException("Expected sort expresson to be descending.");
         }

diff --git a/...QueryableExtensions/Ensure_async_method_provided_for_every_synchronous_query_operation.cs b/...QueryableExtensions/Ensure_async_method_provided_for_every_synchronous_query_operation.cs
@@ -92,7 +92,7 @@ public void Method_should_have_async_counterpart(MethodInfo method)
             .ToArray();
         matchingMethods.ShouldNotBeEmpty($"No '{methodName}' query operation found matching argument list ({string.Join(", ", method.GetParameters().Select(x => x.ParameterType.GetFriendlyName(false, false)))}, {nameof(CancellationToken)})");
 
-        if (matchingMethods.Length != 1)
+        if (matchingMethods.Length is not 1)
         {
             throw new RemoteLinqException($"Implementation error: should have exactly one matching method left at this point: '{methodName}'");
         }