Merge pull request #104 from johelvisguzman/dev

Merge with '2.3.0'

Author: johelvisguzman

samples/DotNetToolkit.Repository.Wpf.Demo/Infrastructure/FormViewModelBase.cs

@@ -14,6 +14,12 @@ public abstract class FormViewModelBase<TValidator> : ViewModelBase where TValid
 
         #endregion
 
+        #region Events
+
+        public event EventHandler Submitted;
+
+        #endregion
+
         #region Properties
 
         public bool IsDirty
@@ -42,7 +48,7 @@ protected FormViewModelBase()
 
         #endregion
 
-        #region Implementation of IValidatable
+        #region Public Methods
 
         public virtual async Task<bool> ValidateAsync()
         {
@@ -61,5 +67,17 @@ public virtual async Task<bool> ValidateAsync()
         }
 
         #endregion
+
+        #region Protected Methods
+
+        protected async void OnSubmitAsync()
+        {
+            if (await ValidateAsync())
+            {
+                Submitted?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
     }
 }

samples/DotNetToolkit.Repository.Wpf.Demo/ViewModels/CustomerFormViewModel.cs

@@ -47,29 +47,11 @@ public DateTime? Date
 
         #endregion
 
-        #region Events
-
-        public event EventHandler Submitted;
-
-        #endregion
-
         #region Constructors
 
         public CustomerFormViewModel()
         {
-            SubmitCommand = new RelayCommand(OnSubmit);
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private async void OnSubmit()
-        {
-            if (await ValidateAsync())
-            {
-                Submitted?.Invoke(this, EventArgs.Empty);
-            }
+            SubmitCommand = new RelayCommand(OnSubmitAsync);
         }
 
         #endregion

src/DotNetToolkit.Repository.AdoNet/AdoNetRepository.cs

@@ -1,6 +1,7 @@
 namespace DotNetToolkit.Repository.AdoNet
 {
-    using Logging;
+    using Interceptors;
+    using System.Collections.Generic;
 
     /// <summary>
     /// Represents a repository for entity framework.
@@ -9,45 +10,71 @@ public class AdoNetRepository<TEntity, TKey> : AdoNetRepositoryBase<TEntity, TKe
     {
         #region Constructors
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        public AdoNetRepository(string connectionString) : base(connectionString) { }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>
         public AdoNetRepository(string providerName, string connectionString) : base(providerName, connectionString) { }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="interceptors">The interceptors.</param>
+        public AdoNetRepository(string connectionString, IEnumerable<IRepositoryInterceptor> interceptors) : base(connectionString, interceptors) { }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>
-        /// <param name="logger">The logger.</param>
-        public AdoNetRepository(string providerName, string connectionString, ILogger logger) : base(providerName, connectionString, logger) { }
+        /// <param name="interceptors">The interceptors.</param>
+        public AdoNetRepository(string providerName, string connectionString, IEnumerable<IRepositoryInterceptor> interceptors) : base(providerName, connectionString, interceptors) { }
 
         #endregion
     }
 
     /// <summary>
     /// Represents a repository for entity framework with a default primary key value of type integer.
     /// </summary>
-    public class AdoNetRepository<TEntity> : AdoNetRepositoryBase<TEntity, int>, IRepository<TEntity> where TEntity : class
+    public class AdoNetRepository<TEntity> : AdoNetRepositoryBase<TEntity, int>, IRepositoryAsync<TEntity> where TEntity : class
     {
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        public AdoNetRepository(string connectionString) : base(connectionString) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>
         public AdoNetRepository(string providerName, string connectionString) : base(providerName, connectionString) { }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="interceptors">The interceptors.</param>
+        public AdoNetRepository(string connectionString, IEnumerable<IRepositoryInterceptor> interceptors) : base(connectionString, interceptors) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>
-        /// <param name="logger">The logger.</param>
-        public AdoNetRepository(string providerName, string connectionString, ILogger logger) : base(providerName, connectionString, logger) { }
+        /// <param name="interceptors">The interceptors.</param>
+        public AdoNetRepository(string providerName, string connectionString, IEnumerable<IRepositoryInterceptor> interceptors) : base(providerName, connectionString, interceptors) { }
 
         #endregion
     }

src/DotNetToolkit.Repository.AdoNet/AdoNetRepositoryBase.cs

@@ -2,14 +2,15 @@
 {
     using FetchStrategies;
     using Helpers;
+    using Interceptors;
     using Internal;
-    using Logging;
     using Properties;
     using Queries;
     using Specifications;
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
+    using System.Configuration;
     using System.Data;
     using System.Data.Common;
     using System.Linq;
@@ -22,7 +23,7 @@
     /// <summary>
     /// Represents a repository for ado.net.
     /// </summary>
-    public abstract class AdoNetRepositoryBase<TEntity, TKey> : RepositoryAsyncBase<TEntity, TKey> where TEntity : class
+    public abstract class AdoNetRepositoryBase<TEntity, TKey> : RepositoryBaseAsync<TEntity, TKey> where TEntity : class
     {
         #region Fields
 
@@ -66,14 +67,37 @@ public abstract class AdoNetRepositoryBase<TEntity, TKey> : RepositoryAsyncBase<
 
         #region Constructors
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepositoryBase{TEntity, TKey}"/> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="interceptors">The interceptors.</param>
+        protected AdoNetRepositoryBase(string connectionString, IEnumerable<IRepositoryInterceptor> interceptors = null) : base(interceptors)
+        {
+            if (string.IsNullOrEmpty(connectionString))
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmptyString, nameof(connectionString));
+
+            var ccs = ConfigurationManager.ConnectionStrings[connectionString];
+            if (ccs == null)
+                throw new ArgumentException(Resources.ConnectionStringDoestNotExistInConfigFile);
+
+            Factory = Internal.DbProviderFactories.GetFactory(ccs.ProviderName);
+            ConnectionString = connectionString;
+
+            Initialize();
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdoNetRepositoryBase{TEntity, TKey}"/> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>
-        /// <param name="logger">The logger.</param>
-        protected AdoNetRepositoryBase(string providerName, string connectionString, ILogger logger = null) : base(logger)
+        /// <param name="interceptors">The interceptors.</param>
+        protected AdoNetRepositoryBase(string providerName, string connectionString, IEnumerable<IRepositoryInterceptor> interceptors = null) : base(interceptors)
         {
+            if (string.IsNullOrEmpty(providerName))
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmptyString, nameof(providerName));
+
             if (string.IsNullOrEmpty(connectionString))
                 throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmptyString, nameof(connectionString));
 
@@ -1686,7 +1710,7 @@ private TEntity AutoMap(DbDataReader r, DbSqlSelectStatementConfig config)
 
         #endregion
 
-        #region Overrides of RepositoryBase<TEntity,TKey>
+        #region Overrides of RepositoryBase<TEntity, TKey>
 
         /// <summary>
         /// A protected overridable method for adding the specified <paramref name="entity" /> into the repository.
@@ -1769,19 +1793,6 @@ protected override TEntity GetEntity(TKey key, IFetchStrategy<TEntity> fetchStra
             return ExecuteObject<TEntity>(config.Sql, config.Parameters, r => AutoMap(r, config));
         }
 
-        /// <summary>
-        /// Gets an entity that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
-        /// </summary>
-        protected override TEntity GetEntity(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options)
-        {
-            if (criteria == null)
-                throw new ArgumentNullException(nameof(criteria));
-
-            PrepareSelectStatement(criteria, options, out DbSqlSelectStatementConfig config);
-
-            return ExecuteObject<TEntity>(config.Sql, config.Parameters, r => AutoMap(r, config));
-        }
-
         /// <summary>
         /// Gets an entity that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
         /// </summary>
@@ -1798,16 +1809,6 @@ protected override TResult GetEntity<TResult>(ISpecification<TEntity> criteria,
             return ExecuteObject<TResult>(config.Sql, config.Parameters, r => AutoMap<TResult>(r, selector, config));
         }
 
-        /// <summary>
-        /// Gets a collection of entities that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
-        /// </summary>
-        protected override IEnumerable<TEntity> GetEntities(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options)
-        {
-            PrepareSelectStatement(criteria, options, out DbSqlSelectStatementConfig config);
-
-            return ExecuteList<TEntity>(config.Sql, config.Parameters, r => AutoMap(r, config));
-        }
-
         /// <summary>
         /// Gets a collection of entities that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
         /// </summary>
@@ -1916,7 +1917,7 @@ public override void Dispose()
 
         #endregion
 
-        #region Overrides of RepositoryAsyncBase<TEntity,TKey>
+        #region Overrides of RepositoryBaseAsync<TEntity, TKey>
 
         /// <summary>
         /// A protected asynchronous overridable method for saving changes made in the current unit of work in the repository.
@@ -1965,19 +1966,6 @@ public override void Dispose()
             return ExecuteObjectAsync<TEntity>(config.Sql, config.Parameters, r => AutoMap(r, config), cancellationToken);
         }
 
-        /// <summary>
-        /// A protected asynchronous overridable method for getting an entity that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
-        /// </summary>
-        protected override Task<TEntity> GetEntityAsync(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options, CancellationToken cancellationToken = new CancellationToken())
-        {
-            if (criteria == null)
-                throw new ArgumentNullException(nameof(criteria));
-
-            PrepareSelectStatement(criteria, options, out DbSqlSelectStatementConfig config);
-
-            return ExecuteObjectAsync<TEntity>(config.Sql, config.Parameters, r => AutoMap(r, config), cancellationToken);
-        }
-
         /// <summary>
         /// A protected asynchronous overridable method for getting an entity that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
         /// </summary>
@@ -1994,24 +1982,11 @@ public override void Dispose()
             return ExecuteObjectAsync<TResult>(config.Sql, config.Parameters, r => AutoMap<TResult>(r, selector, config), cancellationToken);
         }
 
-        /// <summary>
-        /// A protected asynchronous overridable method for getting a collection of entities that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
-        /// </summary>
-        protected override Task<IEnumerable<TEntity>> GetEntitiesAsync(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options, CancellationToken cancellationToken = new CancellationToken())
-        {
-            PrepareSelectStatement(criteria, options, out DbSqlSelectStatementConfig config);
-
-            return ExecuteListAsync<TEntity>(config.Sql, config.Parameters, r => AutoMap(r, config), cancellationToken);
-        }
-
         /// <summary>
         /// A protected asynchronous overridable method for getting a collection of entities that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
         /// </summary>
         protected override Task<IEnumerable<TResult>> GetEntitiesAsync<TResult>(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options, Expression<Func<TEntity, TResult>> selector, CancellationToken cancellationToken = new CancellationToken())
         {
-            if (criteria == null)
-                throw new ArgumentNullException(nameof(criteria));
-
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));