Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public static async Task<List<TSource>> ToListAsync<TSource>(
{
var result = await SpecificationEvaluator.Default.GetQuery(source, specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null
return specification.PostProcessingAction is null
? result
: specification.PostProcessingAction(result).ToList();
: specification.PostProcessingAction(result).AsList();
}

public static async Task<IEnumerable<TSource>> ToEnumerableAsync<TSource>(
Expand All @@ -25,7 +25,7 @@ public static async Task<IEnumerable<TSource>> ToEnumerableAsync<TSource>(
{
var result = await SpecificationEvaluator.Default.GetQuery(source, specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null
return specification.PostProcessingAction is null
? result
: specification.PostProcessingAction(result);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,19 @@ public virtual async Task<List<T>> ListAsync(ISpecification<T> specification, Ca
{
var queryResult = await ApplySpecification(specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null ? queryResult : specification.PostProcessingAction(queryResult).ToList();
return specification.PostProcessingAction is null
? queryResult
: specification.PostProcessingAction(queryResult).AsList();
}

/// <inheritdoc/>
public virtual async Task<List<TResult>> ListAsync<TResult>(ISpecification<T, TResult> specification, CancellationToken cancellationToken = default)
{
var queryResult = await ApplySpecification(specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null ? queryResult : specification.PostProcessingAction(queryResult).ToList();
return specification.PostProcessingAction is null
? queryResult
: specification.PostProcessingAction(queryResult).AsList();
}

/// <inheritdoc/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ public async Task<List<TEntity>> ListAsync(ISpecification<TEntity> specification
await using var dbContext = _dbContextFactory.CreateDbContext();
var queryResult = await ApplySpecification(specification, dbContext).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null ? queryResult : specification.PostProcessingAction(queryResult).ToList();
return specification.PostProcessingAction is null
? queryResult
: specification.PostProcessingAction(queryResult).AsList();
}

/// <inheritdoc/>
Expand All @@ -77,7 +79,9 @@ public async Task<List<TResult>> ListAsync<TResult>(ISpecification<TEntity, TRes
await using var dbContext = _dbContextFactory.CreateDbContext();
var queryResult = await ApplySpecification(specification, dbContext).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null ? queryResult : specification.PostProcessingAction(queryResult).ToList();
return specification.PostProcessingAction is null
? queryResult
: specification.PostProcessingAction(queryResult).AsList();
}

/// <inheritdoc/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ public static async Task<List<TSource>> ToListAsync<TSource>(
{
var result = await SpecificationEvaluator.Default.GetQuery(source, specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null
return specification.PostProcessingAction is null
? result
: specification.PostProcessingAction(result).ToList();
: specification.PostProcessingAction(result).AsList();
}

public static async Task<IEnumerable<TSource>> ToEnumerableAsync<TSource>(
Expand All @@ -23,7 +23,7 @@ public static async Task<IEnumerable<TSource>> ToEnumerableAsync<TSource>(
{
var result = await SpecificationEvaluator.Default.GetQuery(source, specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null
return specification.PostProcessingAction is null
? result
: specification.PostProcessingAction(result);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,19 @@ public virtual async Task<List<T>> ListAsync(ISpecification<T> specification, Ca
{
var queryResult = await ApplySpecification(specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null ? queryResult : specification.PostProcessingAction(queryResult).ToList();
return specification.PostProcessingAction is null
? queryResult
: specification.PostProcessingAction(queryResult).AsList();
}

/// <inheritdoc/>
public virtual async Task<List<TResult>> ListAsync<TResult>(ISpecification<T, TResult> specification, CancellationToken cancellationToken = default)
{
var queryResult = await ApplySpecification(specification).ToListAsync(cancellationToken);

return specification.PostProcessingAction == null ? queryResult : specification.PostProcessingAction(queryResult).ToList();
return specification.PostProcessingAction is null
? queryResult
: specification.PostProcessingAction(queryResult).AsList();
}

/// <inheritdoc/>
Expand Down
14 changes: 14 additions & 0 deletions src/Ardalis.Specification/CollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace Ardalis.Specification;

internal static class CollectionExtensions
{
public static List<T> AsList<T>(this IEnumerable<T> source)
{
if (source is List<T> list)
{
return list;
}

return source.ToList();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public virtual IEnumerable<TResult> Evaluate<T, TResult>(IEnumerable<T> source,
? baseQuery.Select(specification.Selector.Compile())
: baseQuery.SelectMany(specification.SelectorMany!.Compile());

return specification.PostProcessingAction == null
return specification.PostProcessingAction is null
? resultQuery
: specification.PostProcessingAction(resultQuery);
}
Expand All @@ -46,7 +46,7 @@ public virtual IEnumerable<T> Evaluate<T>(IEnumerable<T> source, ISpecification<
source = evaluator.Evaluate(source, specification);
}

return specification.PostProcessingAction == null
return specification.PostProcessingAction is null
? source
: specification.PostProcessingAction(source);
}
Expand Down