Removing ambiguous calls between versions of the framework

Author: tsutomi

src/Deveel.Filter.Model/Filters/Filter.cs

@@ -164,12 +164,15 @@ public static BinaryFilter LessThanOrEqual(Filter left, Filter right)
 		public static BinaryFilter LessThanOrEqual(IFilter left, IFilter right)
 			=> Binary(Convert(left), Convert(right), FilterType.LessThanOrEqual);
 
-		public static FunctionFilter Function(VariableFilter variable, string functionName, params Filter[] arguments)
+		public static FunctionFilter Function(VariableFilter variable, string functionName, Filter[] arguments)
 			=> new FunctionFilter(variable, functionName, arguments);
 
-		public static FunctionFilter Function(VariableFilter variable, string functionName, params IFilter[] arguments)
+		public static FunctionFilter Function(VariableFilter variable, string functionName, IFilter[] arguments)
 			=> new FunctionFilter(variable, functionName, arguments?.Select(Convert).ToArray());
 
+		public static FunctionFilter Function(VariableFilter variable, string functionName)
+			=> new FunctionFilter(variable, functionName, Array.Empty<Filter>());
+
 		public static ConstantFilter Constant(object? value)
 			=> new ConstantFilter(value);
 
@@ -183,7 +186,7 @@ public static VariableFilter Variable(string variableName) {
 			return new VariableFilter(variableName);
 		}
 
-		#endregion
+#endregion
 
 		#region EmptyFilter
 

test/Deveel.Filter.Model.Web.XUnit/Filters/ModelFromFilterTests.cs

@@ -298,7 +298,7 @@ public static void BuildVariableModel() {
 
 		[Fact]
 		public static void BuildFunctionModel() {
-			var function = Filter.Function(Filter.Variable("x"), "f", Filter.Constant(22), Filter.Constant(45));
+			var function = Filter.Function(Filter.Variable("x"), "f", new[] { Filter.Constant(22), Filter.Constant(45) });
 			var model = function.ToFilterModel();
 			Assert.NotNull(model);
 			Assert.NotNull(model.Function);

test/Deveel.Filter.Model.XUnit/Filters/FilterStringTests.cs

@@ -85,7 +85,7 @@ public static void UnaryOfConstantToString(object value, FilterType filterType,
 		public static void FunctionToString(string variable, string functionName, object arg, string expected) {
 			var variableFilter = Filter.Variable(variable);
 			var constantFilter = Filter.Constant(arg);
-			var functionFilter = Filter.Function(variableFilter, functionName, constantFilter);
+			var functionFilter = Filter.Function(variableFilter, functionName, new[] { constantFilter });
 			var actual = functionFilter.ToString();
 			Assert.Equal(expected, actual);
 		}

test/Deveel.Filter.Model.XUnit/Filters/LambdaFunctionTests.cs

@@ -21,7 +21,7 @@ public static void SimpleUnaryAsLambda() {
 		[Fact]
 		public static void ComplexBinaryWithFunctionCallAsLabda() {
 			var filter = Filter.Binary(
-				Filter.Function(Filter.Variable("x"), "Substring", Filter.Constant(1)),
+				Filter.Function(Filter.Variable("x"), "Substring", new[] { Filter.Constant(1) }),
 				Filter.Constant("oobar"),
 				FilterType.Equal);
 
@@ -31,7 +31,7 @@ public static void ComplexBinaryWithFunctionCallAsLabda() {
 
 		[Fact]
 		public static void SimpleFunctionCallAslambda() {
-			var filter = Filter.Function(Filter.Variable("x"), "StartsWith", Filter.Constant("foo"));
+			var filter = Filter.Function(Filter.Variable("x"), "StartsWith", new[] { Filter.Constant("foo") });
 
 			var result = filter.Evaluate("x", "foobar");
 			Assert.True(result);

test/Deveel.Filter.Model.XUnit/Filters/VisitorTests.cs

@@ -52,7 +52,7 @@ public static void VisitUnary() {
 
 		[Fact]
 		public static void VisitFunction() {
-			var function = Filter.Function(Filter.Variable("x"), "test", Filter.Constant(123));
+			var function = Filter.Function(Filter.Variable("x"), "test", new[] { Filter.Constant(123) });
 
 			var visitor = new FilterVisitor();
 			var result = visitor.Visit(function);

test/Deveel.Filter.MongoBson.XUnit/Filters/BsonFilterSerializationTests.cs

@@ -132,7 +132,7 @@ public static void SerializeNot() {
 		[InlineData("x", "Contains", 123)]
 		public static void SerializeFunction(string varName, string functionName, object arg) {
 			var variable = Filter.Variable(varName);
-			var filter = Filter.Function(variable, functionName, Filter.Constant(arg));
+			var filter = Filter.Function(variable, functionName, new[] { Filter.Constant(arg) });
 			var bson = filter.AsBsonDocument();
 			Assert.NotNull(bson);
 			Assert.Equal("function", bson["type"].AsString);

test/Deveel.Filters.DynamicLinq.XUnit/Filters/DynamicFilterTests.cs

@@ -289,7 +289,7 @@ public static void AsDynamicLambda_StringMethods_ShouldConvertToLambda()
 			var filter = Filter.Function(
 				Filter.Variable("Name"),
 				"Contains",
-				Filter.Constant("John"));
+				new[] { Filter.Constant("John") });
 
 			// Act
 			var lambda = filter.AsDynamicLambda<Person>();
@@ -434,7 +434,7 @@ public static void AsDynamicLamda_PrimitiveTypes_ShouldWork()
 			Assert.False((bool)intCompiled.DynamicInvoke(3)!);
 
 			// Test with string
-			var stringFilter = Filter.Function(Filter.Variable("x"), "StartsWith", Filter.Constant("Hello"));
+			var stringFilter = Filter.Function(Filter.Variable("x"), "StartsWith", new[] { Filter.Constant("Hello") });
 			var stringLambda = stringFilter.AsDynamicLamda(typeof(string));
 			var stringCompiled = stringLambda.Compile();
 			Assert.True((bool)stringCompiled.DynamicInvoke("Hello World")!);
@@ -701,7 +701,7 @@ public static void AsDynamicLambda_StringStartsWith_ShouldWork()
 			var filter = Filter.Function(
 				Filter.Variable("Name"),
 				"StartsWith",
-				Filter.Constant("J"));
+				new[] { Filter.Constant("J") });
 
 			// Act
 			var lambda = filter.AsDynamicLambda<Person>();
@@ -724,7 +724,7 @@ public static void AsDynamicLambda_StringEndsWith_ShouldWork()
 			var filter = Filter.Function(
 				Filter.Variable("Name"),
 				"EndsWith",
-				Filter.Constant("son"));
+				new[] { Filter.Constant("son") });
 
 			// Act
 			var lambda = filter.AsDynamicLambda<Person>();
@@ -1135,7 +1135,7 @@ public static void AsDynamicLambda_NestedObjectMethodCall_ShouldWork()
 			var filter = Filter.Function(
 				Filter.Variable("Address.City"),
 				"Contains",
-				Filter.Constant("York"));
+				new[] { Filter.Constant("York") });
 
 			// Act
 			var lambda = filter.AsDynamicLambda<Person>();
@@ -1262,7 +1262,7 @@ public static void AsDynamicLambda_ListContainsExtension_ShouldWork()
 			var filter = Filter.Function(
 				Filter.Variable("Tags"),
 				"Contains",
-				Filter.Constant("developer"));
+				new[] { Filter.Constant("developer") });
 
 			// Act
 			var lambda = filter.AsDynamicLambda<Person>();