Renamed CollectionNotEmptyExpression to HasExpression

Author: Bart Koelman

src/JsonApiDotNetCore/Queries/Expressions/CollectionNotEmptyExpression.cs renamed to src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs

@@ -9,12 +9,12 @@ namespace JsonApiDotNetCore.Queries.Expressions
     /// Represents the "has" filter function, resulting from text such as: has(articles) or has(articles,equals(isHidden,'false'))
     /// </summary>
     [PublicAPI]
-    public class CollectionNotEmptyExpression : FilterExpression
+    public class HasExpression : FilterExpression
     {
         public ResourceFieldChainExpression TargetCollection { get; }
         public FilterExpression Filter { get; }
 
-        public CollectionNotEmptyExpression(ResourceFieldChainExpression targetCollection, FilterExpression filter)
+        public HasExpression(ResourceFieldChainExpression targetCollection, FilterExpression filter)
         {
             ArgumentGuard.NotNull(targetCollection, nameof(targetCollection));
 
@@ -24,7 +24,7 @@ public CollectionNotEmptyExpression(ResourceFieldChainExpression targetCollectio
 
         public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
         {
-            return visitor.VisitCollectionNotEmpty(this, argument);
+            return visitor.VisitHas(this, argument);
         }
 
         public override string ToString()
@@ -57,7 +57,7 @@ public override bool Equals(object obj)
                 return false;
             }
 
-            var other = (CollectionNotEmptyExpression)obj;
+            var other = (HasExpression)obj;
 
             return TargetCollection.Equals(other.TargetCollection) && Equals(Filter, other.Filter);
         }

src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs

@@ -85,15 +85,15 @@ public override QueryExpression VisitNot(NotExpression expression, TArgument arg
             return null;
         }
 
-        public override QueryExpression VisitCollectionNotEmpty(CollectionNotEmptyExpression expression, TArgument argument)
+        public override QueryExpression VisitHas(HasExpression expression, TArgument argument)
         {
             if (expression != null)
             {
                 if (Visit(expression.TargetCollection, argument) is ResourceFieldChainExpression newTargetCollection)
                 {
                     FilterExpression newFilter = expression.Filter != null ? Visit(expression.Filter, argument) as FilterExpression : null;
 
-                    var newExpression = new CollectionNotEmptyExpression(newTargetCollection, newFilter);
+                    var newExpression = new HasExpression(newTargetCollection, newFilter);
                     return newExpression.Equals(expression) ? expression : newExpression;
                 }
             }

src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionVisitor.cs

@@ -48,7 +48,7 @@ public virtual TResult VisitNot(NotExpression expression, TArgument argument)
             return DefaultVisit(expression, argument);
         }
 
-        public virtual TResult VisitCollectionNotEmpty(CollectionNotEmptyExpression expression, TArgument argument)
+        public virtual TResult VisitHas(HasExpression expression, TArgument argument)
         {
             return DefaultVisit(expression, argument);
         }

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

@@ -231,7 +231,7 @@ protected EqualsAnyOfExpression ParseAny()
             return new EqualsAnyOfExpression(targetAttribute, constants);
         }
 
-        protected CollectionNotEmptyExpression ParseHas()
+        protected HasExpression ParseHas()
         {
             EatText(Keywords.Has);
             EatSingleCharacterToken(TokenKind.OpenParen);
@@ -248,7 +248,7 @@ protected CollectionNotEmptyExpression ParseHas()
 
             EatSingleCharacterToken(TokenKind.CloseParen);
 
-            return new CollectionNotEmptyExpression(targetCollection, filter);
+            return new HasExpression(targetCollection, filter);
         }
 
         private FilterExpression ParseFilterInHas(HasManyAttribute hasManyRelationship)

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

@@ -56,7 +56,7 @@ private Expression WhereExtensionMethodCall(LambdaExpression predicate)
             return Expression.Call(_extensionType, "Where", LambdaScope.Parameter.Type.AsArray(), _source, predicate);
         }
 
-        public override Expression VisitCollectionNotEmpty(CollectionNotEmptyExpression expression, Type argument)
+        public override Expression VisitHas(HasExpression expression, Type argument)
         {
             Expression property = Visit(expression.TargetCollection, argument);