diff --git a/framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs b/framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs index a2dd9c3bee..0732a63110 100644 --- a/framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs +++ b/framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs @@ -34,12 +34,7 @@ namespace System.Linq protected override Expression VisitParameter(ParameterExpression node) { - if (node == _oldParameter) - { - return _newParameter; - } - - return base.VisitParameter(node); + return node == _oldParameter ? _newParameter : base.VisitParameter(node); } } @@ -55,20 +50,6 @@ namespace System.Linq return new ExpressionStarter(defaultExpression); } - /// Always true - [Obsolete("Use PredicateBuilder.New() instead.")] - public static Expression> True() - { - return new ExpressionStarter(true); - } - - /// Always false - [Obsolete("Use PredicateBuilder.New() instead.")] - public static Expression> False() - { - return new ExpressionStarter(false); - } - /// OR public static Expression> Or([NotNull] this Expression> expr1, [NotNull] Expression> expr2) @@ -127,9 +108,13 @@ namespace System.Linq public ExpressionStarter(bool defaultExpression) { if (defaultExpression) + { DefaultExpression = f => true; + } else + { DefaultExpression = f => false; + } } public ExpressionStarter(Expression> exp) : this(false)