From a3139cb8920beca092a06bb1ce3ab01a448a8b28 Mon Sep 17 00:00:00 2001
From: David <david@lebee.info>
Date: Mon, 12 Feb 2018 03:35:27 -0600
Subject: [PATCH] renamed.

---
 .../Fluent/QueryBuilder.cs                    | 26 +++++++++----------
 ...eryFilterPart.cs => QueryBuilderFilter.cs} |  4 +--
 .../PoweredSoft.DynamicLinq.csproj            |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename PoweredSoft.DynamicLinq/Fluent/{QueryFilterPart.cs => QueryBuilderFilter.cs} (76%)

diff --git a/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs b/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs
index 48c39f9..3fdf944 100644
--- a/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs
+++ b/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs
@@ -14,7 +14,7 @@ namespace PoweredSoft.DynamicLinq.Fluent
 
         public Type QueryableType { get; set; }
 
-        public List<QueryFilterPart> Parts { get; protected set; } = new List<QueryFilterPart>();
+        public List<QueryBuilderFilter> Parts { get; protected set; } = new List<QueryBuilderFilter>();
 
         public QueryBuilder(IQueryable<T> query)
         {
@@ -25,7 +25,7 @@ namespace PoweredSoft.DynamicLinq.Fluent
             QueryConvertStrategy convertStrategy = QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, 
             bool and = true)
         {
-            Parts.Add(new QueryFilterPart
+            Parts.Add(new QueryBuilderFilter
             {
                 And = and,
                 ConditionOperator = conditionOperators,
@@ -46,7 +46,7 @@ namespace PoweredSoft.DynamicLinq.Fluent
             subQuery(qb);
             
             // create a query part.
-            var part = new QueryFilterPart();
+            var part = new QueryBuilderFilter();
             part.And = and;
             part.Parts = qb.Parts;
             Parts.Add(part);
@@ -88,20 +88,20 @@ namespace PoweredSoft.DynamicLinq.Fluent
             return query;
         }
 
-        protected virtual Expression BuildFilterExpression(ParameterExpression parameter, List<QueryFilterPart> parts)
+        protected virtual Expression BuildFilterExpression(ParameterExpression parameter, List<QueryBuilderFilter> filters)
         {
             Expression ret = null;
 
-            parts.ForEach(part =>
+            filters.ForEach(filter =>
             {
                 Expression innerExpression;
-                if (part.Parts?.Any() == true)
-                    innerExpression = BuildFilterExpression(parameter, part.Parts);
+                if (filter.Parts?.Any() == true)
+                    innerExpression = BuildFilterExpression(parameter, filter.Parts);
                 else
-                    innerExpression = BuildFilterExpression(parameter, part);
+                    innerExpression = BuildFilterExpression(parameter, filter);
 
                 if (ret != null)
-                    ret = part.And ? Expression.And(ret, innerExpression) : Expression.Or(ret, innerExpression);
+                    ret = filter.And ? Expression.And(ret, innerExpression) : Expression.Or(ret, innerExpression);
                 else
                     ret = innerExpression;
             });
@@ -109,11 +109,11 @@ namespace PoweredSoft.DynamicLinq.Fluent
             return ret;
         }
 
-        protected virtual Expression BuildFilterExpression(ParameterExpression parameter, QueryFilterPart part)
+        protected virtual Expression BuildFilterExpression(ParameterExpression parameter, QueryBuilderFilter filter)
         {
-            var member = QueryableHelpers.ResolvePathForExpression(parameter, part.Path);
-            var constant = QueryableHelpers.ResolveConstant(member, part.Value, part.ConvertStrategy);
-            var expression = QueryableHelpers.GetConditionExpressionForMember(parameter, member, part.ConditionOperator, constant);
+            var member = QueryableHelpers.ResolvePathForExpression(parameter, filter.Path);
+            var constant = QueryableHelpers.ResolveConstant(member, filter.Value, filter.ConvertStrategy);
+            var expression = QueryableHelpers.GetConditionExpressionForMember(parameter, member, filter.ConditionOperator, constant);
             return expression;
         }
     }
diff --git a/PoweredSoft.DynamicLinq/Fluent/QueryFilterPart.cs b/PoweredSoft.DynamicLinq/Fluent/QueryBuilderFilter.cs
similarity index 76%
rename from PoweredSoft.DynamicLinq/Fluent/QueryFilterPart.cs
rename to PoweredSoft.DynamicLinq/Fluent/QueryBuilderFilter.cs
index d14de56..ddb984b 100644
--- a/PoweredSoft.DynamicLinq/Fluent/QueryFilterPart.cs
+++ b/PoweredSoft.DynamicLinq/Fluent/QueryBuilderFilter.cs
@@ -6,13 +6,13 @@ using System.Threading.Tasks;
 
 namespace PoweredSoft.DynamicLinq.Fluent
 {
-    public class QueryFilterPart
+    public class QueryBuilderFilter
     {
         public string Path { get; set; }
         public ConditionOperators ConditionOperator { get; set; }
         public object Value { get; set; }
         public bool And { get; set; }
         public QueryConvertStrategy ConvertStrategy { get; set; }
-        public List<QueryFilterPart> Parts { get; set; } = new List<QueryFilterPart>();
+        public List<QueryBuilderFilter> Parts { get; set; } = new List<QueryBuilderFilter>();
     }
 }
diff --git a/PoweredSoft.DynamicLinq/PoweredSoft.DynamicLinq.csproj b/PoweredSoft.DynamicLinq/PoweredSoft.DynamicLinq.csproj
index a06f403..78214a0 100644
--- a/PoweredSoft.DynamicLinq/PoweredSoft.DynamicLinq.csproj
+++ b/PoweredSoft.DynamicLinq/PoweredSoft.DynamicLinq.csproj
@@ -46,7 +46,7 @@
     <Compile Include="Helpers\TypeHelpers.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Fluent\QueryBuilder.cs" />
-    <Compile Include="Fluent\QueryFilterPart.cs" />
+    <Compile Include="Fluent\QueryBuilderFilter.cs" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />