Removed duplicate code

Author: Bart Koelman

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

@@ -83,30 +83,4 @@ private static MemberExpression CreatePropertyExpressionFromComponents(Expressio
 
         return property!;
     }
-
-    protected Expression CreateTupleAccessExpressionForConstant(object? value, Type type)
-    {
-        // To enable efficient query plan caching, inline constants (that vary per request) should be converted into query parameters.
-        // https://stackoverflow.com/questions/54075758/building-a-parameterized-entityframework-core-expression
-
-        // This method can be used to change a query like:
-        //   SELECT ... FROM ... WHERE x."Age" = 3
-        // into:
-        //   SELECT ... FROM ... WHERE x."Age" = @p0
-
-        // The code below builds the next expression for a type T that is unknown at compile time:
-        //   Expression.Property(Expression.Constant(Tuple.Create<T>(value)), "Item1")
-        // Which represents the next C# code:
-        //   Tuple.Create<T>(value).Item1;
-
-        MethodInfo tupleCreateMethod = typeof(Tuple).GetMethods()
-            .Single(method => method.Name == "Create" && method.IsGenericMethod && method.GetGenericArguments().Length == 1);
-
-        MethodInfo constructedTupleCreateMethod = tupleCreateMethod.MakeGenericMethod(type);
-
-        ConstantExpression constantExpression = Expression.Constant(value, type);
-
-        MethodCallExpression tupleCreateCall = Expression.Call(constructedTupleCreateMethod, constantExpression);
-        return Expression.Property(tupleCreateCall, "Item1");
-    }
 }

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

@@ -52,7 +52,7 @@ public override Expression VisitPagination(PaginationExpression expression, obje
 
     private Expression ExtensionMethodCall(Expression source, string operationName, int value)
     {
-        Expression constant = CreateTupleAccessExpressionForConstant(value, typeof(int));
+        Expression constant = value.CreateTupleAccessExpressionForConstant(typeof(int));
 
         return Expression.Call(_extensionType, operationName, LambdaScope.Parameter.Type.AsArray(), source, constant);
     }

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

@@ -270,7 +270,7 @@ public override Expression VisitLiteralConstant(LiteralConstantExpression expres
     {
         object? convertedValue = expressionType != null ? ConvertTextToTargetType(expression.Value, expressionType) : expression.Value;
 
-        return CreateTupleAccessExpressionForConstant(convertedValue, expressionType ?? typeof(string));
+        return convertedValue.CreateTupleAccessExpressionForConstant(expressionType ?? typeof(string));
     }
 
     private static object? ConvertTextToTargetType(string text, Type targetType)

src/JsonApiDotNetCore/Queries/Internal/SystemExpressionExtensions.cs

@@ -0,0 +1,33 @@
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace JsonApiDotNetCore.Queries.Internal;
+
+internal static class SystemExpressionExtensions
+{
+    public static Expression CreateTupleAccessExpressionForConstant(this object? value, Type type)
+    {
+        // To enable efficient query plan caching, inline constants (that vary per request) should be converted into query parameters.
+        // https://stackoverflow.com/questions/54075758/building-a-parameterized-entityframework-core-expression
+
+        // This method can be used to change a query like:
+        //   SELECT ... FROM ... WHERE x."Age" = 3
+        // into:
+        //   SELECT ... FROM ... WHERE x."Age" = @p0
+
+        // The code below builds the next expression for a type T that is unknown at compile time:
+        //   Expression.Property(Expression.Constant(Tuple.Create<T>(value)), "Item1")
+        // Which represents the next C# code:
+        //   Tuple.Create<T>(value).Item1;
+
+        MethodInfo tupleCreateMethod = typeof(Tuple).GetMethods()
+            .Single(method => method.Name == "Create" && method.IsGenericMethod && method.GetGenericArguments().Length == 1);
+
+        MethodInfo constructedTupleCreateMethod = tupleCreateMethod.MakeGenericMethod(type);
+
+        ConstantExpression constantExpression = Expression.Constant(value, type);
+
+        MethodCallExpression tupleCreateCall = Expression.Call(constructedTupleCreateMethod, constantExpression);
+        return Expression.Property(tupleCreateCall, "Item1");
+    }
+}

src/JsonApiDotNetCore/Resources/ResourceFactory.cs

@@ -1,5 +1,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
+using JsonApiDotNetCore.Queries.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace JsonApiDotNetCore.Resources;
@@ -72,8 +73,7 @@ public NewExpression CreateNewExpression(Type resourceClrType)
             {
                 object constructorArgument = ActivatorUtilities.GetServiceOrCreateInstance(_serviceProvider, constructorParameter.ParameterType);
 
-                Expression argumentExpression = CreateTupleAccessExpressionForConstant(constructorArgument, constructorArgument.GetType());
-
+                Expression argumentExpression = constructorArgument.CreateTupleAccessExpressionForConstant(constructorArgument.GetType());
                 constructorArguments.Add(argumentExpression);
             }
 #pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
@@ -88,19 +88,6 @@ public NewExpression CreateNewExpression(Type resourceClrType)
         return Expression.New(longestConstructor, constructorArguments);
     }
 
-    private static Expression CreateTupleAccessExpressionForConstant(object value, Type type)
-    {
-        MethodInfo tupleCreateMethod = typeof(Tuple).GetMethods()
-            .Single(method => method.Name == "Create" && method.IsGenericMethod && method.GetGenericArguments().Length == 1);
-
-        MethodInfo constructedTupleCreateMethod = tupleCreateMethod.MakeGenericMethod(type);
-
-        ConstantExpression constantExpression = Expression.Constant(value, type);
-
-        MethodCallExpression tupleCreateCall = Expression.Call(constructedTupleCreateMethod, constantExpression);
-        return Expression.Property(tupleCreateCall, "Item1");
-    }
-
     private static bool HasSingleConstructorWithoutParameters(Type type)
     {
         ConstructorInfo[] constructors = type.GetConstructors().Where(constructor => !constructor.IsStatic).ToArray();