Stop using DbContextConfiguration to get ILoggerFactory

This is part of Issue #641 which is about cleaning up the use of DbContextConfiguration. DbContextConfiguration is intended to help resolve dynamic services--that is, services for which the actual type/instance of service to use depends on the current context configuration. However, it has gradually spread throughout the code as a general purpose service locator. This causes dependencies to be hidden and creates a lot of coupling to DbContextConfiguration throughout the code, so I am making a set of changes to help fix this.

This change makes things that need and ILoggerFactory depend on it in the normal way rather than getting one from DbContextConfiguration.

Author: ajcvickers

src/EntityFramework.AzureTableStorage/AtsConnection.cs

@@ -28,8 +28,8 @@ protected AtsConnection()
         {
         }
 
-        public AtsConnection([NotNull] DbContextConfiguration configuration)
-            : base(configuration.LoggerFactory)
+        public AtsConnection([NotNull] DbContextConfiguration configuration, [NotNull] ILoggerFactory loggerFactory)
+            : base(loggerFactory)
         {
             Check.NotNull(configuration, "configuration");
 

src/EntityFramework.AzureTableStorage/AtsDataStore.cs

@@ -16,6 +16,7 @@
 using Microsoft.Data.Entity.Infrastructure;
 using Microsoft.Data.Entity.Storage;
 using Microsoft.Data.Entity.Update;
+using Microsoft.Framework.Logging;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Table;
 using Remotion.Linq;
@@ -33,7 +34,11 @@ public class AtsDataStore : DataStore
         /// <summary>
         ///     Provided only for testing purposes. Do not use.
         /// </summary>
-        protected AtsDataStore(DbContextConfiguration configuration, AtsConnection connection, TableEntityAdapterFactory entityFactory)
+        protected AtsDataStore(
+            DbContextConfiguration configuration, 
+            AtsConnection connection, 
+            TableEntityAdapterFactory entityFactory)
+            : base(configuration, new LoggerFactory())
         {
             _configuration = configuration;
             Connection = connection;
@@ -43,8 +48,9 @@ protected AtsDataStore(DbContextConfiguration configuration, AtsConnection conne
         public AtsDataStore([NotNull] DbContextConfiguration configuration,
             [NotNull] AtsConnection connection,
             [NotNull] AtsQueryFactory queryFactory,
-            [NotNull] TableEntityAdapterFactory tableEntityFactory)
-            : base(configuration)
+            [NotNull] TableEntityAdapterFactory tableEntityFactory, 
+            [NotNull] ILoggerFactory loggerFactory)
+            : base(configuration, loggerFactory)
         {
             Check.NotNull(connection, "connection");
             Check.NotNull(queryFactory, "queryFactory");

src/EntityFramework.AzureTableStorage/AtsDatabase.cs

@@ -3,13 +3,14 @@
 
 using JetBrains.Annotations;
 using Microsoft.Data.Entity.Infrastructure;
+using Microsoft.Framework.Logging;
 
 namespace Microsoft.Data.Entity.AzureTableStorage
 {
     public class AtsDatabase : Database
     {
-        public AtsDatabase([NotNull] DbContextConfiguration configuration)
-            : base(configuration)
+        public AtsDatabase([NotNull] DbContextConfiguration configuration, [NotNull] ILoggerFactory loggerFactory)
+            : base(configuration, loggerFactory)
         {
         }
 

src/EntityFramework.Commands/MigrationTool.cs

@@ -175,7 +175,9 @@ private DbContext CreateContext(Type type)
         {
             var context = ContextTool.CreateContext(type);
 
-            context.Configuration.LoggerFactory.AddProvider(_loggerProvider);
+            // TODO: Decouple from DbContextConfiguration (Issue #641)
+            var loggerFactory = (ILoggerFactory)context.Configuration.Services.ServiceProvider.GetService(typeof(ILoggerFactory));
+            loggerFactory.AddProvider(_loggerProvider);
 
             var extension = RelationalOptionsExtension.Extract(context.Configuration);
             if (extension.MigrationAssembly == null)

src/EntityFramework.InMemory/InMemoryDataStore.cs

@@ -14,6 +14,7 @@
 using Microsoft.Data.Entity.Metadata;
 using Microsoft.Data.Entity.Storage;
 using Microsoft.Data.Entity.Utilities;
+using Microsoft.Framework.Logging;
 using Remotion.Linq;
 
 namespace Microsoft.Data.Entity.InMemory
@@ -34,8 +35,9 @@ protected InMemoryDataStore()
 
         public InMemoryDataStore(
             [NotNull] DbContextConfiguration configuration,
-            [NotNull] InMemoryDatabase persistentDatabase)
-            : base(configuration)
+            [NotNull] InMemoryDatabase persistentDatabase,
+            [NotNull] ILoggerFactory loggerFactory)
+            : base(configuration, loggerFactory)
         {
             Check.NotNull(configuration, "configuration");
             Check.NotNull(persistentDatabase, "persistentDatabase");
@@ -49,7 +51,7 @@ public InMemoryDataStore(
             _database = new ThreadSafeLazyRef<InMemoryDatabase>(
                 () => _persist
                     ? persistentDatabase
-                    : new InMemoryDatabase(configuration.LoggerFactory));
+                    : new InMemoryDatabase(loggerFactory));
         }
 
         public virtual InMemoryDatabase Database

src/EntityFramework.Migrations/Infrastructure/Migrator.cs

@@ -44,7 +44,8 @@ public Migrator(
             [NotNull] ModelDiffer modelDiffer,
             [NotNull] IMigrationOperationSqlGeneratorFactory ddlSqlGeneratorFactory,
             [NotNull] SqlGenerator dmlSqlGenerator,
-            [NotNull] SqlStatementExecutor sqlExecutor)
+            [NotNull] SqlStatementExecutor sqlExecutor,
+            [NotNull] ILoggerFactory loggerFactory)
         {
             Check.NotNull(contextConfiguration, "contextConfiguration");
             Check.NotNull(historyRepository, "historyRepository");
@@ -53,6 +54,7 @@ public Migrator(
             Check.NotNull(ddlSqlGeneratorFactory, "ddlSqlGeneratorFactory");
             Check.NotNull(dmlSqlGenerator, "dmlSqlGenerator");
             Check.NotNull(sqlExecutor, "sqlExecutor");
+            Check.NotNull(loggerFactory, "loggerFactory");
 
             _contextConfiguration = contextConfiguration;
             _historyRepository = historyRepository;
@@ -61,7 +63,7 @@ public Migrator(
             _ddlSqlGeneratorFactory = ddlSqlGeneratorFactory;
             _dmlSqlGenerator = dmlSqlGenerator;
             _sqlExecutor = sqlExecutor;
-            _logger = new LazyRef<ILogger>(() => ContextConfiguration.LoggerFactory.Create<Migrator>());
+            _logger = new LazyRef<ILogger>(loggerFactory.Create<Migrator>);
         }
 
         protected virtual DbContextConfiguration ContextConfiguration

src/EntityFramework.Redis/RedisConnection.cs

@@ -5,6 +5,7 @@
 using Microsoft.Data.Entity.Infrastructure;
 using Microsoft.Data.Entity.Redis.Utilities;
 using Microsoft.Data.Entity.Storage;
+using Microsoft.Framework.Logging;
 
 namespace Microsoft.Data.Entity.Redis
 {
@@ -20,10 +21,11 @@ protected RedisConnection()
         {
         }
 
-        public RedisConnection([NotNull] DbContextConfiguration configuration)
-            : base(configuration.LoggerFactory)
+        public RedisConnection([NotNull] DbContextConfiguration configuration, [NotNull] ILoggerFactory loggerFactory)
+            : base(loggerFactory)
         {
             Check.NotNull(configuration, "configuration");
+
             var optionsExtension = RedisOptionsExtension.Extract(configuration);
 
             _connectionString = optionsExtension.HostName + ":" + optionsExtension.Port;

src/EntityFramework.Redis/RedisDataStore.cs

@@ -12,6 +12,7 @@
 using Microsoft.Data.Entity.Redis.Utilities;
 using Microsoft.Data.Entity.Storage;
 using Microsoft.Data.Entity.Utilities;
+using Microsoft.Framework.Logging;
 using Remotion.Linq;
 
 namespace Microsoft.Data.Entity.Redis
@@ -20,8 +21,10 @@ public class RedisDataStore : DataStore
     {
         private readonly LazyRef<RedisDatabase> _database;
 
-        public RedisDataStore([NotNull] DbContextConfiguration configuration)
-            : base(configuration)
+        public RedisDataStore(
+            [NotNull] DbContextConfiguration configuration,
+            [NotNull] ILoggerFactory loggerFactory)
+            : base(configuration, loggerFactory)
         {
             _database = new LazyRef<RedisDatabase>(() => (RedisDatabase)configuration.Database);
         }

src/EntityFramework.Redis/RedisDatabase.cs

@@ -15,6 +15,7 @@
 using Microsoft.Data.Entity.Metadata;
 using Microsoft.Data.Entity.Redis.Query;
 using Microsoft.Data.Entity.Redis.Utilities;
+using Microsoft.Framework.Logging;
 using StackExchange.Redis;
 
 namespace Microsoft.Data.Entity.Redis
@@ -51,8 +52,8 @@ public class RedisDatabase : Database
         private static readonly ConcurrentDictionary<string, ConnectionMultiplexer> _connectionMultiplexers
             = new ConcurrentDictionary<string, ConnectionMultiplexer>(); // key = ConfigurationOptions.ToString()
 
-        public RedisDatabase([NotNull] DbContextConfiguration configuration)
-            : base(configuration)
+        public RedisDatabase([NotNull] DbContextConfiguration configuration, [NotNull] ILoggerFactory loggerFactory)
+            : base(configuration, loggerFactory)
         {
         }
 

src/EntityFramework.Relational/RelationalConnection.cs

@@ -31,8 +31,8 @@ protected RelationalConnection()
         {
         }
 
-        protected RelationalConnection([NotNull] DbContextConfiguration configuration)
-            : base(configuration.LoggerFactory)
+        protected RelationalConnection([NotNull] DbContextConfiguration configuration, [NotNull] ILoggerFactory loggerFactory)
+            : base(loggerFactory)
         {
             Check.NotNull(configuration, "configuration");