Cleanup EFXmlRepo

Author: pranavkm

src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.netcoreapp.cs

@@ -323,7 +323,7 @@ public virtual void StoreElement(System.Xml.Linq.XElement element, string friend
     }
     public partial interface IXmlRepository
     {
-        System.Collections.Generic.IReadOnlyCollection<System.Xml.Linq.XElement?> GetAllElements();
+        System.Collections.Generic.IReadOnlyCollection<System.Xml.Linq.XElement> GetAllElements();
         void StoreElement(System.Xml.Linq.XElement element, string friendlyName);
     }
     public partial class RegistryXmlRepository : Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository

src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.netstandard2.0.cs

@@ -323,7 +323,7 @@ public virtual void StoreElement(System.Xml.Linq.XElement element, string friend
     }
     public partial interface IXmlRepository
     {
-        System.Collections.Generic.IReadOnlyCollection<System.Xml.Linq.XElement?> GetAllElements();
+        System.Collections.Generic.IReadOnlyCollection<System.Xml.Linq.XElement> GetAllElements();
         void StoreElement(System.Xml.Linq.XElement element, string friendlyName);
     }
     public partial class RegistryXmlRepository : Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository

src/DataProtection/DataProtection/src/Repositories/IXmlRepository.cs

@@ -18,7 +18,7 @@ public interface IXmlRepository
         /// <remarks>
         /// All top-level elements in the repository.
         /// </remarks>
-        IReadOnlyCollection<XElement?> GetAllElements();
+        IReadOnlyCollection<XElement> GetAllElements();
 
         /// <summary>
         /// Adds a top-level XML element to the repository.

src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs

@@ -38,15 +38,27 @@ public EntityFrameworkCoreXmlRepository(IServiceProvider services, ILoggerFactor
         }
 
         /// <inheritdoc />
-        public virtual IReadOnlyCollection<XElement?> GetAllElements()
+        public virtual IReadOnlyCollection<XElement> GetAllElements()
         {
-            using (var scope = _services.CreateScope())
+            // forces complete enumeration
+            return GetAllElementsCore().ToList().AsReadOnly();
+
+            IEnumerable<XElement> GetAllElementsCore()
             {
-                var context = scope.ServiceProvider.GetRequiredService<TContext>();
+                using (var scope = _services.CreateScope())
+                {
+                    var context = scope.ServiceProvider.GetRequiredService<TContext>();
+
+                    foreach (var key in context.DataProtectionKeys.AsNoTracking())
+                    {
+                        _logger.ReadingXmlFromKey(key.FriendlyName!, key.Xml);
 
-                // Put logger in a local such that `this` isn't captured.
-                var logger = _logger;
-                return context.DataProtectionKeys.AsNoTracking().Select(key => TryParseKeyXml(key.Xml!, logger)).ToList().AsReadOnly();
+                        if (!string.IsNullOrEmpty(key.Xml))
+                        {
+                            yield return XElement.Parse(key.Xml);
+                        }
+                    }
+                }
             }
         }
 
@@ -67,18 +79,5 @@ public void StoreElement(XElement element, string friendlyName)
                 context.SaveChanges();
             }
         }
-
-        private static XElement? TryParseKeyXml(string xml, ILogger logger)
-        {
-            try
-            {
-                return XElement.Parse(xml);
-            }
-            catch (Exception e)
-            {
-                logger?.LogExceptionWhileParsingKeyXml(xml, e);
-                return null;
-            }
-        }
     }
 }

src/DataProtection/EntityFrameworkCore/src/LoggingExtensions.cs

@@ -7,23 +7,23 @@ namespace Microsoft.Extensions.Logging
 {
     internal static class LoggingExtensions
     {
-        private static readonly Action<ILogger, string, Exception?> _anExceptionOccurredWhileParsingKeyXml;
+        private static readonly Action<ILogger, string?, string?, Exception?> _readingXmlFromKey;
         private static readonly Action<ILogger, string, string, Exception?> _savingKeyToDbContext;
 
         static LoggingExtensions()
         {
-            _anExceptionOccurredWhileParsingKeyXml = LoggerMessage.Define<string>(
-                eventId: new EventId(1, "ExceptionOccurredWhileParsingKeyXml"),
-                logLevel: LogLevel.Warning,
-                formatString: "An exception occurred while parsing the key xml '{Xml}'.");
+            _readingXmlFromKey = LoggerMessage.Define<string?, string?>(
+                eventId: new EventId(1, "ReadKeyFromElement"),
+                logLevel: LogLevel.Debug,
+                formatString: "Reading data with key '{FriendlyName}', value '{Value}'.");
             _savingKeyToDbContext = LoggerMessage.Define<string, string>(
                 eventId: new EventId(2, "SavingKeyToDbContext"),
                 logLevel: LogLevel.Debug,
                 formatString: "Saving key '{FriendlyName}' to '{DbContext}'.");
         }
 
-        public static void LogExceptionWhileParsingKeyXml(this ILogger logger, string keyXml, Exception exception)
-            => _anExceptionOccurredWhileParsingKeyXml(logger, keyXml, exception);
+        public static void ReadingXmlFromKey(this ILogger logger, string? friendlyName, string? keyXml)
+            => _readingXmlFromKey(logger, friendlyName, keyXml, null);
 
         public static void LogSavingKeyToDbContext(this ILogger logger, string friendlyName, string contextName)
             => _savingKeyToDbContext(logger, friendlyName, contextName, null);