Refactor & Code-Cleaning

AutoFilterer.sln

@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution items", "solution
 		.dockerignore = .dockerignore
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		common.props = common.props
 		Dockerfile = Dockerfile
 		LICENSE = LICENSE
 		README.md = README.md

common.props

@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <Version>2.6.0</Version>
+    <Authors>enisn</Authors>
+    <Description>This library provides filtering from DTOs to Entities without writing any query. Visit the project site for more information</Description>
+    <PackageReleaseNotes>Core changes.</PackageReleaseNotes>
+    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
+    <NeutralLanguage>en</NeutralLanguage>
+    <RepositoryUrl>https://github.com/enisn/AutoFilterer</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/enisn/AutoFilterer</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <DefineConstants>LEGACY_NAMESPACE</DefineConstants>
+  </PropertyGroup>
+</Project>

sandbox/WebApplication.API/Dtos/BookFilter.cs

@@ -1,5 +1,8 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
 using System;
 using WebApplication.API.Models;

sandbox/WebApplication.API/Dtos/Northwind/CategoryFilter.cs

@@ -1,11 +1,9 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using WebApplication.API.Models.Northwind;
 
 namespace WebApplication.API.Dtos.Northwind

sandbox/WebApplication.API/Dtos/Northwind/CustomerDemographicFilter.cs

@@ -1,5 +1,8 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
 using System;
 using System.Collections.Generic;

sandbox/WebApplication.API/Dtos/Northwind/CustomerFilter.cs

@@ -1,11 +1,9 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using WebApplication.API.Models.Northwind;
 
 namespace WebApplication.API.Dtos.Northwind

sandbox/WebApplication.API/Dtos/Northwind/EmployeeFilter.cs

@@ -1,5 +1,8 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
 using System;
 using System.Collections.Generic;

sandbox/WebApplication.API/Dtos/Northwind/EmployeeTerritoryFilter.cs

@@ -1,5 +1,5 @@
 using AutoFilterer.Attributes;
-using AutoFilterer.Enums;
+
 using AutoFilterer.Types;
 
 namespace WebApplication.API.Dtos.Northwind

sandbox/WebApplication.API/Dtos/Northwind/OrderFilter.cs

@@ -1,11 +1,10 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using WebApplication.API.Models.Northwind;
 
 namespace WebApplication.API.Dtos.Northwind

sandbox/WebApplication.API/Dtos/Northwind/ProductFilter.cs

@@ -1,13 +1,9 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WebApplication.API.Models.Northwind;
 
 namespace WebApplication.API.Dtos.Northwind
 {

sandbox/WebApplication.API/Dtos/Northwind/RegionFilter.cs

@@ -1,11 +1,9 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace WebApplication.API.Dtos.Northwind
 {

sandbox/WebApplication.API/Dtos/Northwind/ShipperFilter.cs

@@ -1,11 +1,9 @@
-using AutoFilterer.Types;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+#endif
+using AutoFilterer;
 using AutoFilterer.Attributes;
+using AutoFilterer.Types;
 
 namespace WebApplication.API.Dtos.Northwind
 {

sandbox/WebApplication.API/Dtos/Northwind/SupplierFilter.cs

@@ -1,11 +1,9 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using WebApplication.API.Models.Northwind;
 
 namespace WebApplication.API.Dtos.Northwind

sandbox/WebApplication.API/Dtos/Northwind/TerritoryFilter.cs

@@ -1,11 +1,9 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer;
+using AutoFilterer.Attributes;
 using AutoFilterer.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace WebApplication.API.Dtos.Northwind
 {

sandbox/WebApplication.API/WebApplication.API.csproj

@@ -6,6 +6,7 @@
     <UserSecretsId>c6c1cf7a-5843-45cf-bb4b-b21f9e31fc33</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
+    <DefineConstants>LEGACY_NAMESPACE</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>

src/AutoFilterer.Dynamics/AutoFilterer.Dynamics.csproj

@@ -1,19 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <Authors>enisn</Authors>
-    <Description>This library provides filtering from QueryString (Dictionary) to Entities without writing any LINQ. Visit the project site for more information.</Description>
-    <PackageProjectUrl>https://github.com/enisn/AutoFilterer</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/enisn/AutoFilterer</RepositoryUrl>
     <PackageTags>netstandard, EntityFramework, netcore, aspnetcore, auto filter, filtering, sorting, ordering, pagination</PackageTags>
-    <NeutralLanguage>en</NeutralLanguage>
-    <Version>2.5.0</Version>
-    <AssemblyVersion>2.5.0</AssemblyVersion>
-    <PackageReleaseNotes>First Release.</PackageReleaseNotes>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>icon.png</PackageIcon>
+    <DefineConstants>LEGACY_NAMESPACE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

src/AutoFilterer.Dynamics/DynamicFilter.cs

@@ -1,14 +1,13 @@
-using AutoFilterer.Abstractions;
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
-using AutoFilterer.Types;
+#endif
+using AutoFilterer.Abstractions;
+using AutoFilterer.Attributes;
+using AutoFilterer.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AutoFilterer.Dynamics
 {
@@ -72,8 +71,8 @@ public Expression BuildExpression(Type entityType, Expression body)
                     var value = Convert.ChangeType((string)filterValue, targetProperty.PropertyType);
                     var exp = new OperatorComparisonAttribute(OperatorType.Equal).BuildExpression(body, targetProperty, filterProperty: null, value);
 
-                    var combined = Combine(finalExpression, exp);
-                    finalExpression = Combine(body, combined);
+                    var combined = finalExpression.Combine(exp, CombineWith);
+                    finalExpression = body.Combine(combined, CombineWith);
                 }
                 else
                 {
@@ -88,16 +87,14 @@ public Expression BuildExpression(Type entityType, Expression body)
                         {
                             var exp = filterable.BuildExpression(body, targetProperty, filterProperty: null, value);
 
-                            var combined = Combine(finalExpression, exp);
-                            finalExpression = Combine(body, combined);
+                            var combined = finalExpression.Combine(exp, CombineWith);
+                            finalExpression = body.Combine(combined, CombineWith);
                         }
                     }
                     else
                     {
-
                         throw new NotImplementedException("Inner objects are not supported yet!");
                     }
-
                 }
             }
 
@@ -107,33 +104,5 @@ public Expression BuildExpression(Type entityType, Expression body)
         }
 
         private bool IsPrimitive(string key) => !key.Contains('.');
-
-        private protected virtual Expression Combine(Expression body, Expression extend)
-        {
-            return Combine(body, extend, this.CombineWith);
-        }
-
-        private protected virtual Expression Combine(Expression left, Expression right, CombineType combineType)
-        {
-            if (left == null)
-                return right;
-            if (right == null)
-                return left;
-
-            if (left is ParameterExpression || left is MemberExpression)
-                return right;
-            if (right is ParameterExpression || right is MemberExpression)
-                return left;
-
-            switch (combineType)
-            {
-                case CombineType.And:
-                    return Expression.AndAlso(left, right);
-                case CombineType.Or:
-                    return Expression.OrElse(left, right);
-                default:
-                    return right;
-            }
-        }
     }
 }

src/AutoFilterer.Swagger/AutoFilterer.Swagger.csproj

@@ -1,17 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\..\common.props" />
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Authors>enisn</Authors>
-    <Description>This library provides filtering from DTOs to Entities without writing any query. Visit the project site for more information</Description>
-    <PackageProjectUrl>https://github.com/enisn/AutoFilterer</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/enisn/AutoFilterer</RepositoryUrl>
     <PackageTags>netstandard, EntityFramework, netcore, aspnetcore, auto filter, filtering, sorting, ordering, pagination</PackageTags>
-    <NeutralLanguage>en</NeutralLanguage>
-    <Version>2.5.0</Version>
-    <AssemblyVersion>2.5.0</AssemblyVersion>
     <PackageReleaseNotes>Fix inner objects documenting at Swagger UI</PackageReleaseNotes>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
 

src/AutoFilterer/Abstractions/IOrderable.cs

@@ -1,5 +1,7 @@
-using AutoFilterer.Attributes;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
+using AutoFilterer.Attributes;
 using System.Linq;
 
 namespace AutoFilterer.Abstractions

src/AutoFilterer/Attributes/CollectionFilterAttribute.cs

@@ -1,12 +1,11 @@
-using AutoFilterer.Abstractions;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
-using System;
-using System.Collections.Generic;
+#endif
+using AutoFilterer.Abstractions;
+using AutoFilterer;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AutoFilterer.Attributes
 {

src/AutoFilterer/Attributes/CompareToAttribute.cs

@@ -1,14 +1,11 @@
-using AutoFilterer.Abstractions;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
-using System;
+#endif
+using AutoFilterer.Abstractions;
 using System.Collections;
-using System.Collections.Generic;
-using System.Data;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AutoFilterer.Attributes
 {

src/AutoFilterer/Attributes/OperatorComparisonAttribute.cs

@@ -1,4 +1,6 @@
-using AutoFilterer.Enums;
+#if LEGACY_NAMESPACE
+using AutoFilterer.Enums;
+#endif
 using AutoFilterer.Extensions;
 using System;
 using System.Linq.Expressions;

src/AutoFilterer/Attributes/StringFilterOptionsAttribute.cs

@@ -1,12 +1,9 @@
-using AutoFilterer.Abstractions;
+#if LEGACY_NAMESPACE
 using AutoFilterer.Enums;
+#endif
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AutoFilterer.Attributes
 {