diff --git a/src/activities/Elsa.Activities.Webhooks/ActivityTypes/WebhookActivityTypeProvider.cs b/src/activities/Elsa.Activities.Webhooks/ActivityTypes/WebhookActivityTypeProvider.cs index 66586c23a..d24adb36a 100644 --- a/src/activities/Elsa.Activities.Webhooks/ActivityTypes/WebhookActivityTypeProvider.cs +++ b/src/activities/Elsa.Activities.Webhooks/ActivityTypes/WebhookActivityTypeProvider.cs @@ -31,7 +31,7 @@ namespace Elsa.Activities.Webhooks.ActivityTypes public async ValueTask> GetActivityTypesAsync(CancellationToken cancellationToken = default) { - var specification = Specification.All; + var specification = Specification.Identity; var definitions = await _webhookDefinitionStore.FindManyAsync(specification, cancellationToken: cancellationToken); var activityTypes = new List(); diff --git a/src/core/Elsa.Abstractions/Persistence/Specifications/Specification.cs b/src/core/Elsa.Abstractions/Persistence/Specifications/Specification.cs index 079ead936..11d9cc5da 100644 --- a/src/core/Elsa.Abstractions/Persistence/Specifications/Specification.cs +++ b/src/core/Elsa.Abstractions/Persistence/Specifications/Specification.cs @@ -11,8 +11,8 @@ namespace Elsa.Persistence.Specifications /// public abstract class Specification : ISpecification { - public static readonly ISpecification All = new IdentitySpecification(); - public static readonly ISpecification None = All.Not(); + public static readonly ISpecification Identity = new IdentitySpecification(); + public static readonly ISpecification None = Identity.Not(); private Func? _predicate; public virtual bool IsSatisfiedBy(T entity) diff --git a/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationCollectionsExtensions.cs b/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationCollectionsExtensions.cs index a36b4a2be..0b6b4a116 100644 --- a/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationCollectionsExtensions.cs +++ b/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationCollectionsExtensions.cs @@ -6,24 +6,9 @@ namespace Elsa.Persistence.Specifications { public static class SpecificationCollectionsExtensions { - public static ISpecification ToAndSpecification(this IEnumerable> specifications) - { - return specifications.Aggregate(Specification.All, (current, specification) => current.And(specification)); - } - - public static ISpecification ToAndSpecification(this IEnumerable source, Func> specificationFactory) - { - return source.Select(specificationFactory).ToAndSpecification(); - } - - public static ISpecification ToOrSpecification(this IEnumerable> specifications) - { - return specifications.Aggregate(Specification.None, (current, specification) => current.Or(specification)); - } - - public static ISpecification ToOrSpecification(this IEnumerable source, Func> specificationFactory) - { - return source.Select(specificationFactory).ToOrSpecification(); - } + public static ISpecification ToAndSpecification(this IEnumerable> specifications) => specifications.Aggregate(Specification.Identity, (current, specification) => current.And(specification)); + public static ISpecification ToAndSpecification(this IEnumerable source, Func> specificationFactory) => source.Select(specificationFactory).ToAndSpecification(); + public static ISpecification ToOrSpecification(this IEnumerable> specifications) => specifications.Aggregate(Specification.None, (current, specification) => current.Or(specification)); + public static ISpecification ToOrSpecification(this IEnumerable source, Func> specificationFactory) => source.Select(specificationFactory).ToOrSpecification(); } -} +} \ No newline at end of file diff --git a/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationExtensions.cs b/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationExtensions.cs index eeea9d066..cfb7734b9 100644 --- a/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationExtensions.cs +++ b/src/core/Elsa.Abstractions/Persistence/Specifications/SpecificationExtensions.cs @@ -4,20 +4,20 @@ { public static ISpecification And(this ISpecification @this, ISpecification specification) { - var all = Specification.All; + var identity = Specification.Identity; - if (@this == all) + if (@this == identity) return specification; - return specification == all ? @this : new AndSpecification(@this, specification); + return specification == identity ? @this : new AndSpecification(@this, specification); } public static ISpecification Or(this ISpecification @this, ISpecification specification) { - var all = Specification.All; + var identity = Specification.Identity; - if (@this == all || specification == all) - return all; + if (@this == identity || specification == identity) + return identity; return new OrSpecification(@this, specification); } diff --git a/src/core/Elsa.Core/WorkflowProviders/DatabaseWorkflowProvider.cs b/src/core/Elsa.Core/WorkflowProviders/DatabaseWorkflowProvider.cs index eea7383ea..8f040786d 100644 --- a/src/core/Elsa.Core/WorkflowProviders/DatabaseWorkflowProvider.cs +++ b/src/core/Elsa.Core/WorkflowProviders/DatabaseWorkflowProvider.cs @@ -26,7 +26,7 @@ namespace Elsa.WorkflowProviders protected override async ValueTask> OnGetWorkflowsAsync(CancellationToken cancellationToken) { - var workflowDefinitions = await _workflowDefinitionStore.FindManyAsync(Specification.All, cancellationToken: cancellationToken); + var workflowDefinitions = await _workflowDefinitionStore.FindManyAsync(Specification.Identity, cancellationToken: cancellationToken); return await Task.WhenAll(workflowDefinitions.Select(async x => await _workflowBlueprintMaterializer.CreateWorkflowBlueprintAsync(x, cancellationToken))); } }