Changed the ILogger property for all context to ILoggerProvider

jaguzman · jaguzman · commit 1f945b1b9017 · 2019-07-16T13:09:55.000-04:00
diff --git a/src/DotNetToolkit.Repository.AdoNet/Internal/AdoNetRepositoryContext.cs b/src/DotNetToolkit.Repository.AdoNet/Internal/AdoNetRepositoryContext.cs
@@ -2,7 +2,6 @@
 {
     using Configuration.Conventions;
     using Configuration.Logging;
-    using Configuration.Logging.Internal;
     using Extensions;
     using Extensions.Internal;
     using Properties;
@@ -35,7 +34,8 @@ internal class AdoNetRepositoryContext : IAdoNetRepositoryContext
         private readonly SchemaTableConfigurationHelper _schemaConfigHelper;
         private readonly DbHelper _dbHelper;
         private readonly bool _ensureDatabaseCreated;
-        private ILogger _logger = NullLogger.Instance;
+        private ILoggerProvider _loggerProvider;
+        private ILogger _logger;
 
         #endregion
 
@@ -51,13 +51,26 @@ internal class AdoNetRepositoryContext : IAdoNetRepositoryContext
         /// </summary>
         public ILogger Logger
         {
-            get { return _logger; }
-            set
+            get
             {
-                _logger = value;
+                if (_logger == null)
+                    _logger = LoggerProvider?.Create(GetType().FullName);
+
+                return _logger;
+            }
+        }
 
-                if (_dbHelper != null)
-                    _dbHelper.Logger = _logger;
+        /// <summary>
+        /// Gets or sets the repository context logger provider.
+        /// </summary>
+        public ILoggerProvider LoggerProvider
+        {
+            get { return _loggerProvider; }
+            set
+            {
+                _logger = null;
+                _loggerProvider = value;
+                _dbHelper.Logger = _loggerProvider?.Create(_dbHelper.GetType().FullName);
             }
         }
 
@@ -83,6 +96,7 @@ public AdoNetRepositoryContext(string nameOrConnectionString, bool ensureDatabas
             _dbHelper = new DbHelper(Conventions, nameOrConnectionString);
             _schemaConfigHelper = new SchemaTableConfigurationHelper(_dbHelper);
             _ensureDatabaseCreated = ensureDatabaseCreated;
+            _loggerProvider = NullLoggerProvider.Instance;
         }
 
         /// <summary>
@@ -105,6 +119,7 @@ public AdoNetRepositoryContext(string providerName, string connectionString, boo
             _dbHelper = new DbHelper(Conventions, providerName, connectionString);
             _schemaConfigHelper = new SchemaTableConfigurationHelper(_dbHelper);
             _ensureDatabaseCreated = ensureDatabaseCreated;
+            _loggerProvider = NullLoggerProvider.Instance;
         }
 
         /// <summary>
@@ -125,19 +140,11 @@ public AdoNetRepositoryContext(DbConnection existingConnection, bool ensureDatab
             _dbHelper = new DbHelper(Conventions, existingConnection);
             _schemaConfigHelper = new SchemaTableConfigurationHelper(_dbHelper);
             _ensureDatabaseCreated = ensureDatabaseCreated;
+            _loggerProvider = NullLoggerProvider.Instance;
         }
 
         #endregion
 
-        #region Implementation of IAdoNetRepositoryContext
-
-        /// <summary>
-        /// Gets the database helper which contains various methods for retrieving and manipulating data in a database.
-        /// </summary>
-        public DbHelper DbHelper { get { return _dbHelper; } }
-
-        #endregion
-
         #region Private Methods
 
         private void PrepareEntitySetQuery(EntitySet entitySet, bool existInDb, out string sql, out Dictionary<string, object> parameters)
@@ -201,6 +208,15 @@ private async Task ExecuteSchemaValidateAsync(Type entityType, CancellationToken
 
         #endregion
 
+        #region Implementation of IAdoNetRepositoryContext
+
+        /// <summary>
+        /// Gets the database helper which contains various methods for retrieving and manipulating data in a database.
+        /// </summary>
+        public DbHelper DbHelper { get { return _dbHelper; } }
+
+        #endregion
+
         #region Implementation of IRepositoryContext
 
         /// <summary>
@@ -251,7 +267,7 @@ public ITransactionManager BeginTransaction()
         {
             var transaction = _dbHelper.BeginTransaction();
 
-            CurrentTransaction = new AdoNetTransactionManager(transaction, Logger);
+            CurrentTransaction = new AdoNetTransactionManager(transaction);
 
             return CurrentTransaction;
         }
diff --git a/src/DotNetToolkit.Repository.AdoNet/Internal/AdoNetTransactionManager.cs b/src/DotNetToolkit.Repository.AdoNet/Internal/AdoNetTransactionManager.cs
@@ -1,7 +1,5 @@
 ﻿namespace DotNetToolkit.Repository.AdoNet.Internal
 {
-    using Configuration.Logging;
-    using Extensions;
     using System.Data.Common;
     using Transactions;
     using Utility;
@@ -12,12 +10,6 @@
     /// <seealso cref="ITransactionManager" />
     internal class AdoNetTransactionManager : ITransactionManager
     {
-        #region Fields
-
-        private readonly ILogger _logger;
-
-        #endregion
-
         #region Properties
 
         /// <summary>
@@ -33,12 +25,8 @@ internal class AdoNetTransactionManager : ITransactionManager
         /// Initializes a new instance of the <see cref="AdoNetTransactionManager" /> class.
         /// </summary>
         /// <param name="transaction">The underlying transaction.</param>
-        /// <param name="logger">The logger.</param>
-        public AdoNetTransactionManager(DbTransaction transaction, ILogger logger)
+        public AdoNetTransactionManager(DbTransaction transaction)
         {
-            _logger = Guard.NotNull(logger, nameof(logger));
-            _logger.Debug("Started transaction");
-
             Transaction = Guard.NotNull(transaction, nameof(transaction));
         }
 
@@ -52,8 +40,6 @@ public AdoNetTransactionManager(DbTransaction transaction, ILogger logger)
         public void Dispose()
         {
             Transaction.Dispose();
-
-            _logger.Debug("Disposed transaction");
         }
 
         #endregion
@@ -73,8 +59,6 @@ public void Commit()
             Transaction.Commit();
 
             Status = TransactionStatus.Committed;
-
-            _logger.Debug("Committed transaction");
         }
 
         /// <summary>
@@ -85,8 +69,6 @@ public void Rollback()
             Transaction.Rollback();
 
             Status = TransactionStatus.Aborted;
-
-            _logger.Debug("Rolled-back transaction");
         }
 
         #endregion
diff --git a/src/DotNetToolkit.Repository/Configuration/IRepositoryContext.cs b/src/DotNetToolkit.Repository/Configuration/IRepositoryContext.cs
@@ -52,9 +52,9 @@ public interface IRepositoryContext : IDisposable
         IRepositoryConventions Conventions { get; }
 
         /// <summary>
-        /// Gets or sets the repository context logger.
+        /// Gets or sets the repository context logger provider.
         /// </summary>
-        ILogger Logger { get; set; }
+        ILoggerProvider LoggerProvider { get; set; }
 
         /// <summary>
         /// Tracks the specified entity in memory and will be inserted into the database when <see cref="SaveChanges()" /> is called.
diff --git a/src/DotNetToolkit.Repository/Configuration/LinqRepositoryContextBase.cs b/src/DotNetToolkit.Repository/Configuration/LinqRepositoryContextBase.cs
@@ -4,7 +4,6 @@
     using Extensions;
     using JetBrains.Annotations;
     using Logging;
-    using Logging.Internal;
     using Properties;
     using Queries;
     using Queries.Internal;
@@ -23,6 +22,13 @@
     /// </summary>
     public abstract class LinqRepositoryContextBase : IRepositoryContext
     {
+        #region Fields
+
+        private ILoggerProvider _loggerProvider;
+        private ILogger _logger;
+
+        #endregion
+
         #region Properties
 
         /// <summary>
@@ -33,7 +39,29 @@ public abstract class LinqRepositoryContextBase : IRepositoryContext
         /// <summary>
         /// Gets or sets the repository context logger.
         /// </summary>
-        public ILogger Logger { get; set; } = NullLogger.Instance;
+        public ILogger Logger
+        {
+            get
+            {
+                if (_logger == null)
+                    _logger = LoggerProvider?.Create(GetType().FullName);
+
+                return _logger;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the repository context logger provider.
+        /// </summary>
+        public ILoggerProvider LoggerProvider
+        {
+            get { return _loggerProvider; }
+            set
+            {
+                _logger = null;
+                _loggerProvider = value;
+            }
+        }
 
         #endregion
 
@@ -45,6 +73,8 @@ public abstract class LinqRepositoryContextBase : IRepositoryContext
         protected LinqRepositoryContextBase()
         {
             Conventions = RepositoryConventions.Default<LinqRepositoryContextBase>();
+
+            _loggerProvider = NullLoggerProvider.Instance;
         }
 
         #endregion
diff --git a/src/DotNetToolkit.Repository/Internal/RepositoryContextAsyncWrapper.cs b/src/DotNetToolkit.Repository/Internal/RepositoryContextAsyncWrapper.cs
@@ -74,10 +74,10 @@ public IRepositoryConventions Conventions
             get { return _underlyingContext.Conventions; }
         }
 
-        public ILogger Logger
+        public ILoggerProvider LoggerProvider
         {
-            get { return _underlyingContext.Logger; }
-            set { _underlyingContext.Logger = value; }
+            get { return _underlyingContext.LoggerProvider; }
+            set { _underlyingContext.LoggerProvider = value; }
         }
 
         public void Add<TEntity>(TEntity entity) where TEntity : class
diff --git a/src/DotNetToolkit.Repository/RepositoryBase.cs b/src/DotNetToolkit.Repository/RepositoryBase.cs
@@ -6,7 +6,6 @@
     using Configuration.Conventions;
     using Configuration.Interceptors;
     using Configuration.Logging;
-    using Configuration.Logging.Internal;
     using Configuration.Mapper;
     using Configuration.Options;
     using Extensions;
@@ -2982,14 +2981,10 @@ protected virtual IRepositoryContext GetContext()
             Guard.EnsureNotNull(context.Conventions, "No conventions have been configured for this context.");
 
             if (_options.Conventions != null)
-            {
                 context.Conventions.Apply(_options.Conventions);
-            }
 
-            if (context.Logger == null || context.Logger is NullLogger)
-            {
-                context.Logger = LoggerProvider.Create(context.GetType().FullName);
-            }
+            if (context.LoggerProvider == null && LoggerProvider != null)
+                context.LoggerProvider = LoggerProvider;
 
             return context;
         }

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,10 @@ public IRepositoryConventions Conventions`
`74`	`74`	`get { return _underlyingContext.Conventions; }`
`75`	`75`	`}`
`76`	`76`
`77`		`- public ILogger Logger`
	`77`	`+ public ILoggerProvider LoggerProvider`
`78`	`78`	`{`
`79`		`- get { return _underlyingContext.Logger; }`
`80`		`- set { _underlyingContext.Logger = value; }`
	`79`	`+ get { return _underlyingContext.LoggerProvider; }`
	`80`	`+ set { _underlyingContext.LoggerProvider = value; }`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public void Add<TEntity>(TEntity entity) where TEntity : class`