Remove unused extensions and process more warnings

This commit is contained in:
Sipke Schoorstra 2020-11-03 10:58:11 +01:00
parent 7f44bfe4c1
commit 8e1ad31f73
7 changed files with 12 additions and 52 deletions

View file

@ -13,7 +13,7 @@ namespace Elsa.Activities.Http.Parsers
public int Priority => 0;
public string?[] SupportedContentTypes => new[] { "application/x-www-form-urlencoded" };
public async Task<object> ParseAsync(HttpRequest request, Type? targetType = default, CancellationToken cancellationToken = default)
public async Task<object?> ParseAsync(HttpRequest request, Type? targetType = default, CancellationToken cancellationToken = default)
{
var form = await request.ReadFormAsync(cancellationToken);
return form.ToDictionary(

View file

@ -1,9 +1,11 @@
using System.Threading;
using System.Threading.Tasks;
using Elsa.Extensions;
using Elsa.Indexes;
using Elsa.Services;
using Elsa.Triggers;
using NodaTime;
using Open.Linq.AsyncExtensions;
namespace Elsa.Activities.Timers.Triggers
{
@ -32,7 +34,7 @@ namespace Elsa.Activities.Timers.Triggers
{
// Only provide a trigger if the workflow hasn't executed already sometime in the past.
var workflowDefinitionId = context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowBlueprint.Id;
var instanceCount = await _workflowInstanceManager.Query<WorkflowInstanceIndex>(x => x.WorkflowDefinitionId == workflowDefinitionId).CountAsync();
var instanceCount = await _workflowInstanceManager.ListByDefinitionAsync(workflowDefinitionId, cancellationToken).Count();
var configuredInstant = await context.Activity.GetPropertyValueAsync(x => x.Instant, cancellationToken);
var now = _clock.GetCurrentInstant();

View file

@ -12,9 +12,7 @@ namespace Elsa.Services
{
ValueTask SaveAsync(WorkflowInstance workflowInstance, CancellationToken cancellationToken = default);
ValueTask DeleteAsync(WorkflowInstance workflowInstance, CancellationToken cancellationToken = default);
IQuery<WorkflowInstance> Query();
IQuery<WorkflowInstance, TIndex> Query<TIndex>() where TIndex : class, IIndex;
IQuery<WorkflowInstance, TIndex> Query<TIndex>(Expression<Func<TIndex, bool>> predicate) where TIndex : class, IIndex;
IQuery<WorkflowInstance> ExecuteQuery(ICompiledQuery<WorkflowInstance> query);
}
}

View file

@ -13,21 +13,6 @@ namespace Elsa.Extensions
public static IQuery<WorkflowDefinition> QueryByIdAndVersion(this IWorkflowDefinitionManager manager, string workflowDefinitionId, VersionOptions versionOptions) =>
manager.Query<WorkflowDefinitionIndex>(x => x.WorkflowDefinitionId == workflowDefinitionId).WithVersion(versionOptions);
public static IQuery<WorkflowDefinition> QueryByVersionId(
this IWorkflowDefinitionManager manager,
string workflowDefinitionVersionId) =>
manager.Query<WorkflowDefinitionIndex>(x => x.WorkflowDefinitionVersionId == workflowDefinitionVersionId);
public static IQuery<WorkflowDefinition> QueryByVersion(
this IWorkflowDefinitionManager manager,
VersionOptions versionOptions) =>
manager.Query<WorkflowDefinitionIndex>().WithVersion(versionOptions);
public static IQuery<WorkflowInstance> QueryByBlockingActivity(
this IWorkflowInstanceManager manager,
string activityType) =>
manager.Query<WorkflowInstanceBlockingActivitiesIndex>(x => x.ActivityType == activityType);
public static async Task<WorkflowDefinition?> GetAsync(
this IWorkflowDefinitionManager manager,
string workflowDefinitionId,
@ -35,18 +20,6 @@ namespace Elsa.Extensions
CancellationToken cancellationToken = default) =>
await manager.QueryByIdAndVersion(workflowDefinitionId, versionOptions).FirstOrDefaultAsync();
public static async Task<WorkflowDefinition?> GetByVersionIdAsync(
this IWorkflowDefinitionManager manager,
string workflowDefinitionVersionId,
CancellationToken cancellationToken = default) =>
await manager.QueryByVersionId(workflowDefinitionVersionId).FirstOrDefaultAsync();
public static async Task<IEnumerable<WorkflowDefinition>> ListAsync(
this IWorkflowDefinitionManager manager,
VersionOptions versionOptions,
CancellationToken cancellationToken = default) =>
await manager.QueryByVersion(versionOptions).ListAsync();
public static Task<IEnumerable<WorkflowInstance>> ListByStatusAsync(
this IWorkflowInstanceManager manager,
WorkflowStatus workflowStatus,
@ -54,16 +27,5 @@ namespace Elsa.Extensions
manager
.Query<WorkflowInstanceIndex>(x => x.WorkflowStatus == workflowStatus)
.ListAsync();
public static async Task<IEnumerable<WorkflowInstance>> ListByBlockingActivityAsync(
this IWorkflowInstanceManager manager,
string activityType,
CancellationToken cancellationToken = default) =>
await manager.QueryByBlockingActivity(activityType).ListAsync();
public static async Task<IEnumerable<WorkflowInstance>> ListByBlockingActivityAsync<TActivity>(
this IWorkflowInstanceManager manager,
CancellationToken cancellationToken = default) =>
await manager.ListByBlockingActivityAsync(typeof(TActivity).Name, cancellationToken);
}
}

View file

@ -26,10 +26,10 @@ namespace Elsa
private readonly List<LockedBlob> _lockedBlobs = new List<LockedBlob>();
private readonly string _connectionString;
private readonly TimeSpan _leaseTime;
private readonly ILogger<AzureBlobLockProvider> _logger;
private readonly ILogger _logger;
private readonly TimeSpan _renewInterval;
private CloudBlobContainer _cloudBlobContainer;
private Timer _renewTimer;
private CloudBlobContainer? _cloudBlobContainer;
private Timer _renewTimer = default!;
public AzureBlobLockProvider(
string connectionString,
@ -39,6 +39,7 @@ namespace Elsa
{
_logger = logger;
_connectionString = connectionString;
if (leaseTime >= TimeSpan.FromSeconds(MaxLeaseTime) || leaseTime <= TimeSpan.FromSeconds(MinLeaseTime))
{
_logger.LogInformation("Lease time must be between 15 Seconds and 60 seconds, Found {leaseTime.TotalSeconds} seconds. Setting default value of 60 seconds", leaseTime.TotalSeconds);
@ -58,10 +59,7 @@ namespace Elsa
_renewInterval = renewInterval;
}
public Task<bool> AcquireLockAsync(string name, CancellationToken cancellationToken = default) =>
name == null
? throw new ArgumentNullException(nameof(name))
: CreateLockAsync(name, cancellationToken);
public Task<bool> AcquireLockAsync(string name, CancellationToken cancellationToken = default) => CreateLockAsync(name, cancellationToken);
private async Task<bool> CreateLockAsync(string name, CancellationToken cancellationToken = default)
{
@ -161,7 +159,7 @@ namespace Elsa
_cloudBlobContainer = blobClient.GetContainerReference(ContainerName);
if (!_cloudBlobContainer.Exists())
{
_cloudBlobContainer.CreateIfNotExists(BlobContainerPublicAccessType.Off, (BlobRequestOptions)null, (OperationContext)null);
_cloudBlobContainer.CreateIfNotExists(BlobContainerPublicAccessType.Off);
}
}
}

View file

@ -63,7 +63,7 @@ namespace Elsa.Samples.ContextualWorkflowHttp.Workflows
private static void StoreComment(ActivityExecutionContext context)
{
var document = (Document)context.WorkflowExecutionContext.WorkflowContext!;
var comment = (Comment)((HttpRequestModel)context.Input)!.Body!;
var comment = (Comment)((HttpRequestModel)context.Input!).Body!;
document.Comments.Add(comment);
}

View file

@ -10,7 +10,7 @@ namespace Elsa.Scripting.Liquid.Extensions
/// <summary>
/// Renders a Liquid template containing HTML.
/// </summary>
public static Task<string> RenderAsync(this ILiquidTemplateManager manager, string template, TemplateContext context)
public static Task<string?> RenderAsync(this ILiquidTemplateManager manager, string template, TemplateContext context)
{
return manager.RenderAsync(template, context, HtmlEncoder.Default);
}