From 043a1f4b2d4031fd1b9dc81e3d71cfa417b711d0 Mon Sep 17 00:00:00 2001 From: Fati Iseni Date: Mon, 15 May 2023 19:46:20 +0200 Subject: [PATCH] Exposed Evaluators collection as protected in specification evaluators. --- .../Evaluators/SpecificationEvaluator.cs | 8 ++++---- .../Evaluators/SpecificationEvaluator.cs | 8 ++++---- .../Evaluators/InMemorySpecificationEvaluator.cs | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Evaluators/SpecificationEvaluator.cs b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Evaluators/SpecificationEvaluator.cs index b710d966..75d9ebf7 100644 --- a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Evaluators/SpecificationEvaluator.cs +++ b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Evaluators/SpecificationEvaluator.cs @@ -10,11 +10,11 @@ public class SpecificationEvaluator : ISpecificationEvaluator // Will use singleton for default configuration. Yet, it can be instantiated if necessary, with default or provided evaluators. public static SpecificationEvaluator Default { get; } = new SpecificationEvaluator(); - private readonly List evaluators = new List(); + protected List Evaluators { get; } = new List(); public SpecificationEvaluator() { - this.evaluators.AddRange(new IEvaluator[] + this.Evaluators.AddRange(new IEvaluator[] { WhereEvaluator.Instance, SearchEvaluator.Instance, @@ -26,7 +26,7 @@ public SpecificationEvaluator() } public SpecificationEvaluator(IEnumerable evaluators) { - this.evaluators.AddRange(evaluators); + this.Evaluators.AddRange(evaluators); } /// @@ -48,7 +48,7 @@ public virtual IQueryable GetQuery(IQueryable query, ISpecification { if (specification is null) throw new ArgumentNullException("Specification is required"); - var evaluators = evaluateCriteriaOnly ? this.evaluators.Where(x => x.IsCriteriaEvaluator) : this.evaluators; + var evaluators = evaluateCriteriaOnly ? this.Evaluators.Where(x => x.IsCriteriaEvaluator) : this.Evaluators; foreach (var evaluator in evaluators) { diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/SpecificationEvaluator.cs b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/SpecificationEvaluator.cs index c540ecef..aa388b90 100644 --- a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/SpecificationEvaluator.cs +++ b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/SpecificationEvaluator.cs @@ -18,11 +18,11 @@ public class SpecificationEvaluator : ISpecificationEvaluator /// public static SpecificationEvaluator Cached { get; } = new SpecificationEvaluator(true); - private readonly List evaluators = new List(); + protected List Evaluators { get; } = new List(); public SpecificationEvaluator(bool cacheEnabled = false) { - this.evaluators.AddRange(new IEvaluator[] + this.Evaluators.AddRange(new IEvaluator[] { WhereEvaluator.Instance, SearchEvaluator.Instance, @@ -40,7 +40,7 @@ public SpecificationEvaluator(bool cacheEnabled = false) public SpecificationEvaluator(IEnumerable evaluators) { - this.evaluators.AddRange(evaluators); + this.Evaluators.AddRange(evaluators); } /// @@ -62,7 +62,7 @@ public virtual IQueryable GetQuery(IQueryable query, ISpecification { if (specification is null) throw new ArgumentNullException("Specification is required"); - var evaluators = evaluateCriteriaOnly ? this.evaluators.Where(x => x.IsCriteriaEvaluator) : this.evaluators; + var evaluators = evaluateCriteriaOnly ? this.Evaluators.Where(x => x.IsCriteriaEvaluator) : this.Evaluators; foreach (var evaluator in evaluators) { diff --git a/Specification/src/Ardalis.Specification/Evaluators/InMemorySpecificationEvaluator.cs b/Specification/src/Ardalis.Specification/Evaluators/InMemorySpecificationEvaluator.cs index 8dccb89b..26df3d5f 100644 --- a/Specification/src/Ardalis.Specification/Evaluators/InMemorySpecificationEvaluator.cs +++ b/Specification/src/Ardalis.Specification/Evaluators/InMemorySpecificationEvaluator.cs @@ -12,11 +12,11 @@ public class InMemorySpecificationEvaluator : IInMemorySpecificationEvaluator // Will use singleton for default configuration. Yet, it can be instantiated if necessary, with default or provided evaluators. public static InMemorySpecificationEvaluator Default { get; } = new InMemorySpecificationEvaluator(); - private readonly List evaluators = new List(); + protected List Evaluators { get; } = new List(); public InMemorySpecificationEvaluator() { - this.evaluators.AddRange(new IInMemoryEvaluator[] + this.Evaluators.AddRange(new IInMemoryEvaluator[] { WhereEvaluator.Instance, SearchEvaluator.Instance, @@ -26,7 +26,7 @@ public InMemorySpecificationEvaluator() } public InMemorySpecificationEvaluator(IEnumerable evaluators) { - this.evaluators.AddRange(evaluators); + this.Evaluators.AddRange(evaluators); } public virtual IEnumerable Evaluate(IEnumerable source, ISpecification specification) @@ -47,7 +47,7 @@ public virtual IEnumerable Evaluate(IEnumerable source, public virtual IEnumerable Evaluate(IEnumerable source, ISpecification specification) { - foreach (var evaluator in evaluators) + foreach (var evaluator in Evaluators) { source = evaluator.Evaluate(source, specification); }