Use params IEnumerable<string> args

JJConsulting · Dec 6, 2024 · a8f5553 · a8f5553
1 parent b0ebab0
commit a8f5553
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Core/DataDictionary/Services/DataDictionaryServiceBase.cs b/src/Core/DataDictionary/Services/DataDictionaryServiceBase.cs
@@ -84,7 +84,7 @@ public bool ValidateName(string name)
         return validationDictionary.IsValid;
     }
 
-    protected static bool ValidateExpression(string value, params string[] args)
+    protected static bool ValidateExpression(string value, params IEnumerable<string> args)
     {
         return args.Any(value.StartsWith);
     }

diff --git a/src/Core/DataDictionary/Services/FieldService.cs b/src/Core/DataDictionary/Services/FieldService.cs
@@ -193,8 +193,8 @@ private async ValueTask<bool> ValidateFieldAsync(FormElement formElement, FormEl
 
     private void ValidateExpressions(FormElementField field)
     {
-        var syncProviders = expressionProviders.GetSyncProvidersPrefixes();
-        var asyncProviders = expressionProviders.GetAsyncProvidersPrefixes();
+        var syncProviders = expressionProviders.GetSyncProvidersPrefixes().ToArray();
+        var asyncProviders = expressionProviders.GetAsyncProvidersPrefixes().ToArray();
 
         if (string.IsNullOrWhiteSpace(field.VisibleExpression))
             AddError(nameof(field.VisibleExpression), StringLocalizer["Required [VisibleExpression] field"]);

diff --git a/src/Core/Extensions/ExpressionProviderEnumerableExtensions.cs b/src/Core/Extensions/ExpressionProviderEnumerableExtensions.cs
@@ -6,17 +6,17 @@ namespace JJMasterData.Core.Extensions;
 
 public static class ExpressionProviderEnumerableExtensions
 {
-    public static string[] GetProvidersPrefixes(this IEnumerable<IExpressionProvider> expressionProviders)
+    public static IEnumerable<string> GetProvidersPrefixes(this IEnumerable<IExpressionProvider> expressionProviders)
     {
-        return expressionProviders.Select(p => p.Prefix).ToArray();
+        return expressionProviders.Select(p => p.Prefix);
     }
-    public static string[] GetAsyncProvidersPrefixes(this IEnumerable<IExpressionProvider> expressionProviders)
+    public static IEnumerable<string> GetAsyncProvidersPrefixes(this IEnumerable<IExpressionProvider> expressionProviders)
     {
-        return expressionProviders.Where(p => p is IAsyncExpressionProvider).Select(p => p.Prefix).ToArray();
+        return expressionProviders.OfType<IAsyncExpressionProvider>().Select(p => p.Prefix);
     }
 
-    public static string[] GetSyncProvidersPrefixes(this IEnumerable<IExpressionProvider> expressionProviders)
+    public static IEnumerable<string> GetSyncProvidersPrefixes(this IEnumerable<IExpressionProvider> expressionProviders)
     {
-        return expressionProviders.Where(p => p is ISyncExpressionProvider).Select(p => p.Prefix).ToArray();
+        return expressionProviders.OfType<ISyncExpressionProvider>().Select(p => p.Prefix);
     }
 }