Renamed EqualsAnyOfExpression to AnyExpression

Author: Bart Koelman

src/JsonApiDotNetCore/Queries/Expressions/EqualsAnyOfExpression.cs renamed to src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs

@@ -11,12 +11,12 @@ namespace JsonApiDotNetCore.Queries.Expressions
     /// Represents the "any" filter function, resulting from text such as: any(name,'Jack','Joe')
     /// </summary>
     [PublicAPI]
-    public class EqualsAnyOfExpression : FilterExpression
+    public class AnyExpression : FilterExpression
     {
         public ResourceFieldChainExpression TargetAttribute { get; }
         public IReadOnlyCollection<LiteralConstantExpression> Constants { get; }
 
-        public EqualsAnyOfExpression(ResourceFieldChainExpression targetAttribute, IReadOnlyCollection<LiteralConstantExpression> constants)
+        public AnyExpression(ResourceFieldChainExpression targetAttribute, IReadOnlyCollection<LiteralConstantExpression> constants)
         {
             ArgumentGuard.NotNull(targetAttribute, nameof(targetAttribute));
             ArgumentGuard.NotNull(constants, nameof(constants));
@@ -32,7 +32,7 @@ public EqualsAnyOfExpression(ResourceFieldChainExpression targetAttribute, IRead
 
         public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
         {
-            return visitor.VisitEqualsAnyOf(this, argument);
+            return visitor.VisitAny(this, argument);
         }
 
         public override string ToString()
@@ -61,7 +61,7 @@ public override bool Equals(object obj)
                 return false;
             }
 
-            var other = (EqualsAnyOfExpression)obj;
+            var other = (AnyExpression)obj;
 
             return TargetAttribute.Equals(other.TargetAttribute) && Constants.SequenceEqual(other.Constants);
         }

src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs

@@ -180,14 +180,14 @@ public override QueryExpression VisitMatchText(MatchTextExpression expression, T
             return null;
         }
 
-        public override QueryExpression VisitEqualsAnyOf(EqualsAnyOfExpression expression, TArgument argument)
+        public override QueryExpression VisitAny(AnyExpression expression, TArgument argument)
         {
             if (expression != null)
             {
                 var newTargetAttribute = Visit(expression.TargetAttribute, argument) as ResourceFieldChainExpression;
                 IReadOnlyCollection<LiteralConstantExpression> newConstants = VisitSequence(expression.Constants, argument);
 
-                var newExpression = new EqualsAnyOfExpression(newTargetAttribute, newConstants);
+                var newExpression = new AnyExpression(newTargetAttribute, newConstants);
                 return newExpression.Equals(expression) ? expression : newExpression;
             }
 

src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionVisitor.cs

@@ -78,7 +78,7 @@ public virtual TResult VisitMatchText(MatchTextExpression expression, TArgument
             return DefaultVisit(expression, argument);
         }
 
-        public virtual TResult VisitEqualsAnyOf(EqualsAnyOfExpression expression, TArgument argument)
+        public virtual TResult VisitAny(AnyExpression expression, TArgument argument)
         {
             return DefaultVisit(expression, argument);
         }

src/JsonApiDotNetCore/Queries/Internal/Parsing/FilterParser.cs

@@ -187,7 +187,7 @@ protected MatchTextExpression ParseTextMatch(string matchFunctionName)
             return new MatchTextExpression(targetAttribute, constant, matchKind);
         }
 
-        protected EqualsAnyOfExpression ParseAny()
+        protected AnyExpression ParseAny()
         {
             EatText(Keywords.Any);
             EatSingleCharacterToken(TokenKind.OpenParen);
@@ -228,7 +228,7 @@ protected EqualsAnyOfExpression ParseAny()
                 }
             }
 
-            return new EqualsAnyOfExpression(targetAttribute, constants);
+            return new AnyExpression(targetAttribute, constants);
         }
 
         protected HasExpression ParseHas()

src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs

@@ -310,7 +310,7 @@ private FilterExpression CreateFilterByIds<TId>(ICollection<TId> ids, AttrAttrib
             else if (ids.Count > 1)
             {
                 List<LiteralConstantExpression> constants = ids.Select(id => new LiteralConstantExpression(id.ToString())).ToList();
-                filter = new EqualsAnyOfExpression(idChain, constants);
+                filter = new AnyExpression(idChain, constants);
             }
 
             // @formatter:keep_existing_linebreaks true

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

@@ -115,7 +115,7 @@ public override Expression VisitMatchText(MatchTextExpression expression, Type a
             return Expression.Call(property, "Contains", null, text);
         }
 
-        public override Expression VisitEqualsAnyOf(EqualsAnyOfExpression expression, Type argument)
+        public override Expression VisitAny(AnyExpression expression, Type argument)
         {
             Expression property = Visit(expression.TargetAttribute, argument);
 

test/JsonApiDotNetCoreExampleTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs

@@ -51,7 +51,7 @@ public override QueryExpression VisitComparison(ComparisonExpression expression,
             return base.VisitComparison(expression, argument);
         }
 
-        public override QueryExpression VisitEqualsAnyOf(EqualsAnyOfExpression expression, object argument)
+        public override QueryExpression VisitAny(AnyExpression expression, object argument)
         {
             PropertyInfo property = expression.TargetAttribute.Fields.Last().Property;
 
@@ -61,7 +61,7 @@ public override QueryExpression VisitEqualsAnyOf(EqualsAnyOfExpression expressio
                 return RewriteFilterOnCarStringIds(expression.TargetAttribute, carStringIds);
             }
 
-            return base.VisitEqualsAnyOf(expression, argument);
+            return base.VisitAny(expression, argument);
         }
 
         public override QueryExpression VisitMatchText(MatchTextExpression expression, object argument)