Simplified some constructors for use with dependency injection

Yuck · Jan 23, 2022 · a4bf7fc · a4bf7fc
1 parent ce07276
commit a4bf7fc
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 21 deletions.
diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj b/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
     <Product>YuckQi.Data</Product>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <Description>An implementation of YuckQi.Data for MongoDB databases.</Description>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/RetrievalHandler.cs
@@ -11,8 +11,10 @@ namespace YuckQi.Data.Sql.Dapper.MySql.Handlers
 {
     public class RetrievalHandler<TEntity, TKey, TScope, TRecord> : RetrievalHandlerBase<TEntity, TKey, TScope, TRecord> where TEntity : IEntity<TKey> where TKey : struct where TScope : IDbTransaction
     {
-        public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : base(sqlGenerator, DbTypeMap.Default, mapper) { }
+        public RetrievalHandler(IMapper mapper) : this(mapper, new SqlGenerator<TRecord>()) { }
 
-        public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+        public RetrievalHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator) : this(mapper, sqlGenerator, DbTypeMap.Default) { }
+
+        public RetrievalHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper, sqlGenerator, dbTypeMap) { }
     }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/SearchHandler.cs b/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/SearchHandler.cs
@@ -11,8 +11,10 @@ namespace YuckQi.Data.Sql.Dapper.MySql.Handlers
 {
     public class SearchHandler<TEntity, TKey, TScope, TRecord> : SearchHandlerBase<TEntity, TKey, TScope, TRecord> where TEntity : IEntity<TKey> where TKey : struct where TScope : IDbTransaction
     {
-        public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : base(sqlGenerator, DbTypeMap.Default, mapper) { }
+        public SearchHandler(IMapper mapper) : this(mapper, new SqlGenerator<TRecord>()) { }
 
-        public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+        public SearchHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator) : this(mapper, sqlGenerator, DbTypeMap.Default) { }
+
+        public SearchHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper, sqlGenerator, dbTypeMap) { }
     }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj b/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <Description>An implementation of YuckQi.Data for MySQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/RetrievalHandler.cs
@@ -11,8 +11,10 @@ namespace YuckQi.Data.Sql.Dapper.Oracle.Handlers
 {
     public class RetrievalHandler<TEntity, TKey, TScope, TRecord> : RetrievalHandlerBase<TEntity, TKey, TScope, TRecord> where TEntity : IEntity<TKey> where TKey : struct where TScope : IDbTransaction
     {
-        public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : base(sqlGenerator, DbTypeMap.Default, mapper) { }
+        public RetrievalHandler(IMapper mapper) : this(mapper, new SqlGenerator<TRecord>()) { }
 
-        public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+        public RetrievalHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator) : this(mapper, sqlGenerator, DbTypeMap.Default) { }
+
+        public RetrievalHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper, sqlGenerator, dbTypeMap) { }
     }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/SearchHandler.cs b/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/SearchHandler.cs
@@ -11,8 +11,10 @@ namespace YuckQi.Data.Sql.Dapper.Oracle.Handlers
 {
     public class SearchHandler<TEntity, TKey, TScope, TRecord> : SearchHandlerBase<TEntity, TKey, TScope, TRecord> where TEntity : IEntity<TKey> where TKey : struct where TScope : IDbTransaction
     {
-        public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : base(sqlGenerator, DbTypeMap.Default, mapper) { }
+        public SearchHandler(IMapper mapper) : this(mapper, new SqlGenerator<TRecord>()) { }
 
-        public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+        public SearchHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator) : this(mapper, sqlGenerator, DbTypeMap.Default) { }
+
+        public SearchHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper, sqlGenerator, dbTypeMap) { }
     }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj b/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>An implementation of YuckQi.Data for Oracle databases using Dapper and SimpleCRUD.</Description>
     <Authors>Kevin J Lambert</Authors>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/RetrievalHandler.cs
@@ -11,8 +11,10 @@ namespace YuckQi.Data.Sql.Dapper.SqlServer.Handlers
 {
     public class RetrievalHandler<TEntity, TKey, TScope, TRecord> : RetrievalHandlerBase<TEntity, TKey, TScope, TRecord> where TEntity : IEntity<TKey> where TKey : struct where TScope : IDbTransaction
     {
-        public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : base(sqlGenerator, DbTypeMap.Default, mapper) { }
+        public RetrievalHandler(IMapper mapper) : this(mapper, new SqlGenerator<TRecord>()) { }
 
-        public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+        public RetrievalHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator) : this(mapper, sqlGenerator, DbTypeMap.Default) { }
+
+        public RetrievalHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper, sqlGenerator, dbTypeMap) { }
     }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/SearchHandler.cs b/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/SearchHandler.cs
@@ -11,8 +11,10 @@ namespace YuckQi.Data.Sql.Dapper.SqlServer.Handlers
 {
     public class SearchHandler<TEntity, TKey, TScope, TRecord> : SearchHandlerBase<TEntity, TKey, TScope, TRecord> where TEntity : IEntity<TKey> where TKey : struct where TScope : IDbTransaction
     {
-        public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : base(sqlGenerator, DbTypeMap.Default, mapper) { }
+        public SearchHandler(IMapper mapper) : this(mapper, new SqlGenerator<TRecord>()) { }
 
-        public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+        public SearchHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator) : this(mapper, sqlGenerator, DbTypeMap.Default) { }
+
+        public SearchHandler(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper, sqlGenerator, dbTypeMap) { }
     }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj b/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <Description>An implementation of YuckQi.Data for MSSQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/RetrievalHandlerBase.cs b/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/RetrievalHandlerBase.cs
@@ -24,7 +24,7 @@ public class RetrievalHandlerBase<TEntity, TKey, TScope, TRecord> : RetrievalHan
 
         #region Constructors
 
-        protected RetrievalHandlerBase(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(mapper)
+        protected RetrievalHandlerBase(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper)
         {
             _sqlGenerator = sqlGenerator ?? throw new ArgumentNullException(nameof(sqlGenerator));
             _dbTypeMap = dbTypeMap;

diff --git a/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/SearchHandlerBase.cs b/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/SearchHandlerBase.cs
@@ -27,7 +27,7 @@ public abstract class SearchHandlerBase<TEntity, TKey, TScope, TRecord> : Search
 
         #region Constructors
 
-        protected SearchHandlerBase(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper mapper) : base(mapper)
+        protected SearchHandlerBase(IMapper mapper, ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(mapper)
         {
             _sqlGenerator = sqlGenerator ?? throw new ArgumentNullException(nameof(sqlGenerator));
             _dbTypeMap = dbTypeMap;

diff --git a/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj b/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj b/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Entity Framework.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data/YuckQi.Data.csproj b/src/YuckQi.Data/YuckQi.Data.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <Description>A .NET library of lightweight data access handlers which can be used to compose repositories and domain services.</Description>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>