Possible multiple enumerations of IEnumerable collection new (#4158)

* User story 100880 - Made changes from IEnumerable to IReadOnlyCollection * ExportJobTask file changed --------- Co-authored-by: Ajaj Vanu <[email protected]>
microsoft · Aug 28, 2024 · 43e184c · 43e184c
1 parent 76698e7
commit 43e184c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/src/Microsoft.Health.Fhir.Api/Features/Binders/DictionaryExpansionConfigurationProvider.cs b/src/Microsoft.Health.Fhir.Api/Features/Binders/DictionaryExpansionConfigurationProvider.cs
@@ -44,11 +44,11 @@ public override void Load()
 
         _configurationProvider.Load();
 
-        IEnumerable<string> keys = _configurationProvider.GetChildKeys(Array.Empty<string>(), null);
+        var keys = _configurationProvider.GetChildKeys(Array.Empty<string>(), null).ToList();
 
         var data = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-        EnumerateKeys((IReadOnlyCollection<string>)keys, data);
+        EnumerateKeys(keys, data);
 
         Data = data;
     }
@@ -103,7 +103,7 @@ private void EnumerateKeys(IReadOnlyCollection<string> keys, Dictionary<string,
                 }
             }
 
-            var innerKeys = (IReadOnlyCollection<string>)_configurationProvider.GetChildKeys(Array.Empty<string>(), keyPath);
+            var innerKeys = _configurationProvider.GetChildKeys(Array.Empty<string>(), keyPath).ToList();
             EnumerateKeys(innerKeys, data, keyPath);
         }
     }

diff --git a/src/Microsoft.Health.Fhir.Core/Extensions/SearchServiceExtensions.cs b/src/Microsoft.Health.Fhir.Core/Extensions/SearchServiceExtensions.cs
@@ -96,7 +96,7 @@ public static class SearchServiceExtensions
                         throw new PreconditionFailedException(string.Format(CultureInfo.InvariantCulture, Core.Resources.ConditionalOperationNotSelectiveEnough, instanceType));
                     }
 
-                    if (results?.Results.Any() == true)
+                    if (results?.Results?.Any() == true)
                     {
                         matchedResults.AddRange(
                             results?.Results

diff --git a/src/Microsoft.Health.Fhir.Core/Features/Conformance/ConformanceProviderBase.cs b/src/Microsoft.Health.Fhir.Core/Features/Conformance/ConformanceProviderBase.cs
@@ -26,7 +26,7 @@ internal void ClearCache()
             _evaluatedQueries.Clear();
         }
 
-        public async Task<bool> SatisfiesAsync(IEnumerable<CapabilityQuery> queries, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> SatisfiesAsync(IReadOnlyCollection<CapabilityQuery> queries, CancellationToken cancellationToken = default(CancellationToken))
         {
             EnsureArg.IsNotNull(queries, nameof(queries));
 

diff --git a/src/Microsoft.Health.Fhir.Core/Features/Conformance/IConformanceProvider.cs b/src/Microsoft.Health.Fhir.Core/Features/Conformance/IConformanceProvider.cs
@@ -32,6 +32,6 @@ public interface IConformanceProvider
         /// </summary>
         /// <param name="queries">Query to check.</param>
         /// <param name="cancellationToken">Cancellation token.</param>
-        Task<bool> SatisfiesAsync(IEnumerable<CapabilityQuery> queries, CancellationToken cancellationToken = default(CancellationToken));
+        Task<bool> SatisfiesAsync(IReadOnlyCollection<CapabilityQuery> queries, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/src/Microsoft.Health.Fhir.Core/Features/Conformance/SystemConformanceProvider.cs b/src/Microsoft.Health.Fhir.Core/Features/Conformance/SystemConformanceProvider.cs
@@ -135,7 +135,7 @@ public SystemConformanceProvider(
 
                         using (IScoped<IEnumerable<IProvideCapability>> providerFactory = _capabilityProviders())
                         {
-                            IEnumerable<IProvideCapability> providers = providerFactory.Value;
+                            var providers = providerFactory.Value.ToList();
                             foreach (IProvideCapability provider in providers)
                             {
                                 Stopwatch watch = Stopwatch.StartNew();

diff --git a/src/Microsoft.Health.Fhir.Core/Features/Operations/Export/ExportJobTask.cs b/src/Microsoft.Health.Fhir.Core/Features/Operations/Export/ExportJobTask.cs
@@ -550,10 +550,10 @@ private async Task SearchWithFilter(
                     || string.IsNullOrWhiteSpace(_exportJobRecord.ResourceType)
                     || _exportJobRecord.ResourceType.Contains(KnownResourceTypes.Patient, StringComparison.OrdinalIgnoreCase))
                 {
-                    ProcessSearchResults(searchResult.Results, anonymizer);
+                    ProcessSearchResults(searchResult?.Results.ToList(), anonymizer);
                 }
 
-                if (searchResult.ContinuationToken == null)
+                if (searchResult?.ContinuationToken == null)
                 {
                     break;
                 }

diff --git a/src/Microsoft.Health.Fhir.Core/Features/Validation/ValidateCapabilityPreProcessor.cs b/src/Microsoft.Health.Fhir.Core/Features/Validation/ValidateCapabilityPreProcessor.cs
@@ -3,6 +3,7 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
 
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using EnsureThat;
@@ -27,7 +28,7 @@ public async Task Process(TRequest request, CancellationToken cancellationToken)
         {
             if (request is IRequireCapability provider)
             {
-                if (!await _conformanceProvider.SatisfiesAsync(provider.RequiredCapabilities(), cancellationToken))
+                if (!await _conformanceProvider.SatisfiesAsync(provider.RequiredCapabilities().ToList(), cancellationToken))
                 {
                     throw new MethodNotAllowedException(Core.Resources.RequestedActionNotAllowed);
                 }