Fixed issues in filter combinators. (ChilliCream#4490)

src/HotChocolate/Data/src/Data/Filters/Expressions/QueryableCombinator.cs

@@ -14,7 +14,7 @@ public override bool TryCombineOperations(
         FilterCombinator combinator,
         [NotNullWhen(true)] out Expression combined)
     {
-        if (operations.Count < 1)
+        if (operations.Count == 0)
         {
             throw ThrowHelper.Filtering_QueryableCombinator_QueueEmpty(this);
         }

src/HotChocolate/MongoDb/src/Data/Filters/MongoDbFilterCombinator.cs

@@ -18,16 +18,17 @@ public override bool TryCombineOperations(
             FilterCombinator combinator,
             [NotNullWhen(true)] out MongoDbFilterDefinition combined)
         {
-            if (operations.Count < 1)
+            if (operations.Count == 0)
             {
-                throw new InvalidOperationException();
+                throw ThrowHelper.Filtering_MongoDbCombinator_QueueEmpty(this);
             }
 
             combined = combinator switch
             {
                 FilterCombinator.And => CombineWithAnd(context, operations),
                 FilterCombinator.Or => CombineWithOr(context, operations),
-                _ => throw new InvalidOperationException()
+                _ => throw ThrowHelper
+                    .Filtering_MongoDbCombinator_InvalidCombinator(this, combinator)
             };
 
             return true;

src/HotChocolate/MongoDb/src/Data/MongoDbResources.resx

@@ -27,5 +27,10 @@
     <data name="Paging_SourceIsNotSupported" xml:space="preserve">
     <value>The provided source {0} is not supported for mongo paging</value>
   </data>
-
+  <data name="Filtering_MongoDbCombinator_QueueEmpty" xml:space="preserve">
+    <value>MongoDbCombinator {0} could not combine expressions. There were no expressions to combine.</value>
+  </data>
+  <data name="Filtering_MongoDbCombinator_InvalidCombinator" xml:space="preserve">
+    <value>MongoDbCombinator {0} could not combine expression. {1} is a invalid combinator</value>
+  </data>
 </root>

src/HotChocolate/MongoDb/src/Data/ThrowHelper.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Globalization;
+using HotChocolate.Data.Filters;
+using HotChocolate.Data.MongoDb.Filters;
 
 namespace HotChocolate.Data.MongoDb
 {
@@ -14,5 +17,21 @@ public static GraphQLException PagingTypeNotSupported(Type type)
                     .SetCode(ErrorCodes.Data.NoPagingationProviderFound)
                     .Build());
         }
+
+        public static InvalidOperationException Filtering_MongoDbCombinator_QueueEmpty(
+            MongoDbFilterCombinator combinator) =>
+            new(string.Format(
+                CultureInfo.CurrentCulture,
+                MongoDbResources.Filtering_MongoDbCombinator_QueueEmpty,
+                combinator.GetType()));
+
+        public static InvalidOperationException Filtering_MongoDbCombinator_InvalidCombinator(
+            MongoDbFilterCombinator combinator,
+            FilterCombinator operation) =>
+            new(string.Format(
+                CultureInfo.CurrentCulture,
+                MongoDbResources.Filtering_MongoDbCombinator_InvalidCombinator,
+                combinator.GetType(),
+                operation.ToString()));
     }
 }

src/HotChocolate/Neo4J/src/Data/Filtering/Neo4JFilterCombinator.cs

@@ -16,16 +16,17 @@ public override bool TryCombineOperations(
             FilterCombinator combinator,
             [NotNullWhen(true)] out Condition combined)
         {
-            if (operations.Count < 1)
+            if (operations.Count == 0)
             {
-                throw new InvalidOperationException();
+                throw ThrowHelper.Filtering_Neo4JFilterCombinator_QueueEmpty(this);
             }
 
             combined = combinator switch
             {
                 FilterCombinator.And => CombineWithAnd(operations),
                 FilterCombinator.Or => CombineWithOr(operations),
-                _ => throw new InvalidOperationException()
+                _ => throw ThrowHelper
+                    .Filtering_Neo4JFilterCombinator_InvalidCombinator(this, combinator)
             };
 
             return true;

src/HotChocolate/Neo4J/src/Data/Neo4JResources.resx

@@ -42,4 +42,10 @@
   <data name="Projection_RelationshipDirectionNotSet" xml:space="preserve">
     <value>Relationship direction not set.</value>
   </data>
+  <data name="Filtering_Neo4JCombinator_QueueEmpty" xml:space="preserve">
+    <value>Neo4JCombinator {0} could not combine expressions. There were no expressions to combine.</value>
+  </data>
+  <data name="Filtering_Neo4JCombinator_InvalidCombinator" xml:space="preserve">
+    <value>Neo4JCombinator {0} could not combine expression. {1} is a invalid combinator</value>
+  </data>
 </root>

src/HotChocolate/Neo4J/src/Data/ThrowHelper.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Globalization;
+using HotChocolate.Data.Filters;
+using HotChocolate.Data.Neo4J.Filtering;
 
 namespace HotChocolate.Data.Neo4J
 {
@@ -36,5 +39,22 @@ public static GraphQLException PagingTypeNotSupported(Type type)
                     .SetCode(ErrorCodes.Data.NoPagingationProviderFound)
                     .Build());
         }
+
+        public static InvalidOperationException Filtering_Neo4JFilterCombinator_QueueEmpty(
+            Neo4JFilterCombinator combinator) =>
+            new(string.Format(
+                CultureInfo.CurrentCulture,
+                Neo4JResources.Filtering_Neo4JCombinator_QueueEmpty,
+                combinator.GetType()));
+
+        public static InvalidOperationException Filtering_Neo4JFilterCombinator_InvalidCombinator(
+            Neo4JFilterCombinator combinator,
+            FilterCombinator operation) =>
+            new(string.Format(
+                CultureInfo.CurrentCulture,
+                Neo4JResources.Filtering_Neo4JCombinator_InvalidCombinator,
+                combinator.GetType(),
+                operation.ToString()));
+
     }
 }