Merge pull request #522 from johelvisguzman/cache-conventions-2

Added a generic constraint to the repository conventions

Author: johelvisguzman

src/DotNetToolkit.Repository.AdoNet/Internal/AdoNetRepositoryContext.cs

@@ -79,7 +79,7 @@ public AdoNetRepositoryContext(string nameOrConnectionString, bool ensureDatabas
         {
             Guard.NotEmpty(nameOrConnectionString, nameof(nameOrConnectionString));
 
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<AdoNetRepositoryContext>();
 
             _dbHelper = new DbHelper(Conventions, nameOrConnectionString);
             _schemaConfigHelper = new SchemaTableConfigurationHelper(_dbHelper);
@@ -101,7 +101,7 @@ public AdoNetRepositoryContext(string providerName, string connectionString, boo
             Guard.NotEmpty(providerName, nameof(providerName));
             Guard.NotEmpty(connectionString, nameof(connectionString));
 
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<AdoNetRepositoryContext>();
 
             _dbHelper = new DbHelper(Conventions, providerName, connectionString);
             _schemaConfigHelper = new SchemaTableConfigurationHelper(_dbHelper);
@@ -121,7 +121,7 @@ public AdoNetRepositoryContext(DbConnection existingConnection, bool ensureDatab
         {
             Guard.NotNull(existingConnection, nameof(existingConnection));
 
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<AdoNetRepositoryContext>();
 
             _dbHelper = new DbHelper(Conventions, existingConnection);
             _schemaConfigHelper = new SchemaTableConfigurationHelper(_dbHelper);

src/DotNetToolkit.Repository.EntityFramework/Internal/EfRepositoryContext.cs

@@ -36,7 +36,7 @@ internal class EfRepositoryContext : LinqRepositoryContextBaseAsync
         /// <param name="context">The context.</param>
         public EfRepositoryContext(DbContext context)
         {
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<EfRepositoryContext>();
 
             _context = Guard.NotNull(context, nameof(context));
             _context.Database.Log = s => Logger?.Debug(s.TrimEnd(Environment.NewLine.ToCharArray()));

src/DotNetToolkit.Repository.EntityFrameworkCore/Internal/EfCoreRepositoryContext.cs

@@ -36,7 +36,7 @@ internal class EfCoreRepositoryContext : LinqRepositoryContextBaseAsync
         /// <param name="context">The context.</param>
         public EfCoreRepositoryContext(DbContext context)
         {
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<EfCoreRepositoryContext>();
 
             _context = Guard.NotNull(context, nameof(context));
             _context.ConfigureLogging(s => Logger.Debug(s.TrimEnd(Environment.NewLine.ToCharArray())));

src/DotNetToolkit.Repository.InMemory/Internal/InMemoryRepositoryContext.cs

@@ -58,7 +58,7 @@ public InMemoryRepositoryContext(bool ignoreTransactionWarning = false, bool ign
         public InMemoryRepositoryContext(string databaseName, bool ignoreTransactionWarning = false, bool ignoreSqlQueryWarning = false)
         {
             DatabaseName = string.IsNullOrEmpty(databaseName) ? DefaultDatabaseName : databaseName;
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<InMemoryRepositoryContext>();
 
             _ignoreTransactionWarning = ignoreTransactionWarning;
             _ignoreSqlQueryWarning = ignoreSqlQueryWarning;

src/DotNetToolkit.Repository.Json/Internal/FileStreamRepositoryContextBase.cs

@@ -58,7 +58,7 @@ protected FileStreamRepositoryContextBase(string path, string extension, bool ig
             if (!path.EndsWith(@"\"))
                 path += @"\";
 
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<JsonRepositoryContext>();
 
             _items = new BlockingCollection<EntitySet>();
             _ignoreTransactionWarning = ignoreTransactionWarning;

src/DotNetToolkit.Repository.Xml/Internal/FileStreamRepositoryContextBase.cs

@@ -58,7 +58,7 @@ protected FileStreamRepositoryContextBase(string path, string extension, bool ig
             if (!path.EndsWith(@"\"))
                 path += @"\";
 
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<XmlRepositoryContext>();
 
             _items = new BlockingCollection<EntitySet>();
             _ignoreTransactionWarning = ignoreTransactionWarning;

src/DotNetToolkit.Repository/Configuration/Conventions/RepositoryConventions.cs

@@ -68,10 +68,10 @@ public RepositoryConventions([NotNull] Type owner)
         /// <summary>
         /// Gets the default conventions.
         /// </summary>
-        /// <param name="owner">type that owns this conventions</param>
-        public static IRepositoryConventions Default([NotNull] Type owner)
+        /// <typeparam name="TOwner">The type that owns this conventions.</typeparam>
+        public static IRepositoryConventions Default<TOwner>() where TOwner : IRepositoryContext
         {
-            var conventions = new RepositoryConventions(Guard.NotNull(owner, nameof(owner)));
+            var conventions = new RepositoryConventions(typeof(TOwner));
 
             conventions.PrimaryKeysCallback = pi => PrimaryKeyConventionHelper.GetPrimaryKeyPropertyInfos(conventions, pi);
             conventions.ForeignKeysCallback = (sourceType, foreignType) => ForeignKeyConventionHelper.GetForeignKeyPropertyInfos(conventions, sourceType, foreignType);

src/DotNetToolkit.Repository/Configuration/LinqRepositoryContextBase.cs

@@ -44,7 +44,7 @@ public abstract class LinqRepositoryContextBase : IRepositoryContext
         /// </summary>
         protected LinqRepositoryContextBase()
         {
-            Conventions = RepositoryConventions.Default(GetType());
+            Conventions = RepositoryConventions.Default<LinqRepositoryContextBase>();
         }
 
         #endregion

src/DotNetToolkit.Repository/Configuration/Options/RepositoryOptionsBuilder.cs

@@ -228,7 +228,7 @@ public virtual RepositoryOptionsBuilder UseConventions([NotNull] Action<IReposit
 
             conventionsAction(conventions);
 
-            _options = _options.With(Guard.NotNull(conventions, nameof(conventions)));
+            _options = _options.With(conventions);
 
             return this;
         }

src/DotNetToolkit.Repository/Extensions/RepositoryConventionsExtensions.cs

@@ -2,6 +2,7 @@
 {
     using Configuration;
     using Configuration.Conventions;
+    using Extensions.Internal;
     using JetBrains.Annotations;
     using Properties;
     using Queries.Strategies;
@@ -365,10 +366,20 @@ public static void Apply<T>([NotNull] this T target, [NotNull] T source) where T
         }
 
         private static Type EnsureOwner([NotNull] IRepositoryConventions source)
-            => Guard.EnsureNotNull(
-                Guard.NotNull(source, nameof(source)).Owner,
+        {
+            Guard.NotNull(source, nameof(source));
+
+            var owner = Guard.EnsureNotNull(
+                source.Owner,
                 string.Format("The conventions '{0}' cannot be null.", nameof(source.Owner)));
 
+            if (!owner.ImplementsInterface(typeof(IRepositoryContext)))
+                throw new InvalidOperationException(string.Format(
+                    "The conventions '{0}' is not an instance of type '{1}'.", nameof(source.Owner), typeof(IRepositoryContext).FullName));
+
+            return owner;
+        }
+
         private static T EnsureCallback<T>([NotNull] T value, [InvokerParameterName] string parameterName) where T : class
             => Guard.EnsureNotNull(
                 value,