Rename TagWithEvaluator to QueryTagEvaluator. (#512)

fiseni · web-flow · commit 2176ce2fed1b · 2025-06-13T12:22:08.000+02:00
diff --git a/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/QueryTagEvaluator.cs b/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/QueryTagEvaluator.cs
@@ -1,9 +1,9 @@
 ﻿namespace Ardalis.Specification.EntityFrameworkCore;
 
-public class TagWithEvaluator : IEvaluator
+public class QueryTagEvaluator : IEvaluator
 {
-    private TagWithEvaluator() { }
-    public static TagWithEvaluator Instance { get; } = new TagWithEvaluator();
+    private QueryTagEvaluator() { }
+    public static QueryTagEvaluator Instance { get; } = new QueryTagEvaluator();
 
     public bool IsCriteriaEvaluator { get; } = true;
 
@@ -15,8 +15,7 @@ public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specific
 
             if (spec.OneOrManyQueryTags.HasSingleItem)
             {
-                query = query.TagWith(spec.OneOrManyQueryTags.Single);
-                return query;
+                return query.TagWith(spec.OneOrManyQueryTags.Single);
             }
         }
 
diff --git a/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/SpecificationEvaluator.cs b/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/SpecificationEvaluator.cs
@@ -28,7 +28,7 @@ public SpecificationEvaluator()
             IgnoreQueryFiltersEvaluator.Instance,
             IgnoreAutoIncludesEvaluator.Instance,
             AsSplitQueryEvaluator.Instance,
-            TagWithEvaluator.Instance,
+            QueryTagEvaluator.Instance,
         ];
     }
 
diff --git a/tests/Ardalis.Specification.EntityFrameworkCore.Tests/Evaluators/QueryTagEvaluatorTests.cs b/tests/Ardalis.Specification.EntityFrameworkCore.Tests/Evaluators/QueryTagEvaluatorTests.cs
@@ -1,9 +1,9 @@
 ﻿namespace Tests.Evaluators;
 
 [Collection("SharedCollection")]
-public class TagWithEvaluatorTests(TestFactory factory) : IntegrationTest(factory)
+public class QueryTagEvaluatorTests(TestFactory factory) : IntegrationTest(factory)
 {
-    private static readonly TagWithEvaluator _evaluator = TagWithEvaluator.Instance;
+    private static readonly QueryTagEvaluator _evaluator = QueryTagEvaluator.Instance;
 
     [Fact]
     public void QueriesMatch_GivenTag()
diff --git a/tests/Ardalis.Specification.EntityFrameworkCore.Tests/Evaluators/SpecificationEvaluatorTests.cs b/tests/Ardalis.Specification.EntityFrameworkCore.Tests/Evaluators/SpecificationEvaluatorTests.cs
@@ -359,7 +359,7 @@ public void DerivedSpecificationEvaluatorCanAlterDefaultEvaluator()
         result[10].Should().BeOfType<IgnoreQueryFiltersEvaluator>();
         result[11].Should().BeOfType<IgnoreAutoIncludesEvaluator>();
         result[12].Should().BeOfType<AsSplitQueryEvaluator>();
-        result[13].Should().BeOfType<TagWithEvaluator>();
+        result[13].Should().BeOfType<QueryTagEvaluator>();
         result[14].Should().BeOfType<WhereEvaluator>();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`namespace Ardalis.Specification.EntityFrameworkCore;`
`2`	`2`
`3`		`-public class TagWithEvaluator : IEvaluator`
	`3`	`+public class QueryTagEvaluator : IEvaluator`
`4`	`4`	`{`
`5`		`- private TagWithEvaluator() { }`
`6`		`- public static TagWithEvaluator Instance { get; } = new TagWithEvaluator();`
	`5`	`+ private QueryTagEvaluator() { }`
	`6`	`+ public static QueryTagEvaluator Instance { get; } = new QueryTagEvaluator();`
`7`	`7`
`8`	`8`	`public bool IsCriteriaEvaluator { get; } = true;`
`9`	`9`
`@@ -15,8 +15,7 @@ public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specific`
`15`	`15`
`16`	`16`	`if (spec.OneOrManyQueryTags.HasSingleItem)`
`17`	`17`	`{`
`18`		`- query = query.TagWith(spec.OneOrManyQueryTags.Single);`
`19`		`- return query;`
	`18`	`+ return query.TagWith(spec.OneOrManyQueryTags.Single);`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public SpecificationEvaluator()`
`28`	`28`	`IgnoreQueryFiltersEvaluator.Instance,`
`29`	`29`	`IgnoreAutoIncludesEvaluator.Instance,`
`30`	`30`	`AsSplitQueryEvaluator.Instance,`
`31`		`- TagWithEvaluator.Instance,`
	`31`	`+ QueryTagEvaluator.Instance,`
`32`	`32`	`];`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ public void DerivedSpecificationEvaluatorCanAlterDefaultEvaluator()`
`359`	`359`	`result[10].Should().BeOfType<IgnoreQueryFiltersEvaluator>();`
`360`	`360`	`result[11].Should().BeOfType<IgnoreAutoIncludesEvaluator>();`
`361`	`361`	`result[12].Should().BeOfType<AsSplitQueryEvaluator>();`
`362`		`- result[13].Should().BeOfType<TagWithEvaluator>();`
	`362`	`+ result[13].Should().BeOfType<QueryTagEvaluator>();`
`363`	`363`	`result[14].Should().BeOfType<WhereEvaluator>();`
`364`	`364`	`}`
`365`	`365`