From a614b3afb34f26d25f7099c0f6a0f3db9e1b1992 Mon Sep 17 00:00:00 2001 From: David Lebee Date: Wed, 17 Oct 2018 21:42:54 -0500 Subject: [PATCH] better without. --- PoweredSoft.DynamicQuery.Cli/Program.cs | 11 +++++------ PoweredSoft.DynamicQuery.Core/IFilterInterceptor.cs | 5 ----- PoweredSoft.DynamicQuery/QueryHandler.cs | 4 ---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/PoweredSoft.DynamicQuery.Cli/Program.cs b/PoweredSoft.DynamicQuery.Cli/Program.cs index affa8ab..a3dc86d 100644 --- a/PoweredSoft.DynamicQuery.Cli/Program.cs +++ b/PoweredSoft.DynamicQuery.Cli/Program.cs @@ -8,7 +8,6 @@ namespace PoweredSoft.DynamicQuery.Cli public class PersonQueryInterceptor : IQueryInterceptor //, IBeforeQueryAlteredInterceptor //, IFilterInterceptor - , IFilterInterceptor { public IQueryable InterceptQueryBeforeAltered(IQueryCriteria criteria, IQueryable queryable) => queryable.Where(t => t.FirstName.StartsWith("Da")); @@ -39,11 +38,6 @@ namespace PoweredSoft.DynamicQuery.Cli return filter; } - - public IFilter InterceptFilter(IFilter filter) - { - return InterceptFilter(filter); - } } public class Person @@ -53,6 +47,11 @@ namespace PoweredSoft.DynamicQuery.Cli public string LastName { get; set; } } + public class OtherClass + { + + } + class Program { static void Main(string[] args) diff --git a/PoweredSoft.DynamicQuery.Core/IFilterInterceptor.cs b/PoweredSoft.DynamicQuery.Core/IFilterInterceptor.cs index 1585d6c..1d72c90 100644 --- a/PoweredSoft.DynamicQuery.Core/IFilterInterceptor.cs +++ b/PoweredSoft.DynamicQuery.Core/IFilterInterceptor.cs @@ -6,9 +6,4 @@ namespace PoweredSoft.DynamicQuery.Core { IFilter InterceptFilter(IFilter filter); } - - public interface IFilterInterceptor : IQueryInterceptor - { - IFilter InterceptFilter(IFilter filter); - } } diff --git a/PoweredSoft.DynamicQuery/QueryHandler.cs b/PoweredSoft.DynamicQuery/QueryHandler.cs index 89fb80d..74bf903 100644 --- a/PoweredSoft.DynamicQuery/QueryHandler.cs +++ b/PoweredSoft.DynamicQuery/QueryHandler.cs @@ -92,10 +92,6 @@ namespace PoweredSoft.DynamicQuery .Cast() .Aggregate(filter, (previousFilter, interceptor) => interceptor.InterceptFilter(previousFilter)); - ret = Interceptors.Where(t => t is IFilterInterceptor) - .Cast>() - .Aggregate(filter, (previousFilter, interceptor) => interceptor.InterceptFilter(previousFilter)); - return ret; }