Removed the needless complication of type parameter from sort expression

Yuck · Jan 31, 2021 · 936f1dd · 936f1dd
1 parent 5c48dcf
commit 936f1dd
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/src/YuckQi.Data.Sql.Dapper/Providers/Abstract/ReadProviderBase.cs b/src/YuckQi.Data.Sql.Dapper/Providers/Abstract/ReadProviderBase.cs
@@ -61,7 +61,7 @@ protected string BuildSqlForGet(IReadOnlyCollection<IDataParameter> parameters)
             return sql;
         }
 
-        protected string BuildSqlForSearch<TSortExpression>(IReadOnlyCollection<IDataParameter> parameters, IPage page, IOrderedEnumerable<ISortExpression<TSortExpression>> sort) where TSortExpression : class
+        protected string BuildSqlForSearch(IReadOnlyCollection<IDataParameter> parameters, IPage page, IOrderedEnumerable<ISortExpression> sort)
         {
             var columns = BuildColumnsSql();
             var sorting = string.Join(", ", sort.Select(t => t.GetSortExpression()));

diff --git a/src/YuckQi.Data.Sql.Dapper/Providers/SearchProvider.cs b/src/YuckQi.Data.Sql.Dapper/Providers/SearchProvider.cs
@@ -30,7 +30,7 @@ public SearchProvider(IUnitOfWork uow) : base(uow)
 
         #region Public Methods
 
-        public async Task<IPage<TEntity>> SearchAsync<TSortExpression>(IReadOnlyCollection<IDataParameter> parameters, IPage page, IOrderedEnumerable<ISortExpression<TSortExpression>> sort) where TSortExpression : class
+        public async Task<IPage<TEntity>> SearchAsync(IReadOnlyCollection<IDataParameter> parameters, IPage page, IOrderedEnumerable<ISortExpression> sort)
         {
             if (parameters == null)
                 throw new ArgumentNullException(nameof(parameters));
@@ -47,7 +47,7 @@ public async Task<IPage<TEntity>> SearchAsync<TSortExpression>(IReadOnlyCollecti
             return new Page<TEntity>(entities, total, page.PageNumber, page.PageSize);
         }
 
-        public Task<IPage<TEntity>> SearchAsync<TSortExpression>(object parameters, IPage page, IOrderedEnumerable<ISortExpression<TSortExpression>> sort) where TSortExpression : class
+        public Task<IPage<TEntity>> SearchAsync(object parameters, IPage page, IOrderedEnumerable<ISortExpression> sort)
         {
             return SearchAsync(parameters?.ToParameterCollection<SqlParameter>(), page, sort);
         }

diff --git a/src/YuckQi.Data.Sql.Dapper/Sorting/SortExpression.cs b/src/YuckQi.Data.Sql.Dapper/Sorting/SortExpression.cs
@@ -3,11 +3,11 @@
 
 namespace YuckQi.Data.Sql.Dapper.Sorting
 {
-    public class SortExpression : ISortExpression<string>
+    public class SortExpression : ISortExpression
     {
-        public SortCriteria<string> Criteria { get; }
+        public SortCriteria Criteria { get; }
 
-        public SortExpression(SortCriteria<string> criteria)
+        public SortExpression(SortCriteria criteria)
         {
             Criteria = criteria;
         }

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>0.4.0</Version>
+    <Version>0.4.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>An implementation of YuckQi.Data using Dapper and SimpleCRUD.</Description>
   </PropertyGroup>

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.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>0.4.0</Version>
+    <Version>0.4.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>An implementation of YuckQi.Data using Entity Framework.</Description>
   </PropertyGroup>

diff --git a/src/YuckQi.Data/Providers/Abstract/ISearchProvider.cs b/src/YuckQi.Data/Providers/Abstract/ISearchProvider.cs
@@ -10,7 +10,7 @@ namespace YuckQi.Data.Providers.Abstract
 {
     public interface ISearchProvider<TEntity, TKey> where TEntity : IEntity<TKey> where TKey : struct
     {
-        Task<IPage<TEntity>> SearchAsync<TSortExpression>(IReadOnlyCollection<IDataParameter> parameters, IPage page, IOrderedEnumerable<ISortExpression<TSortExpression>> sort) where TSortExpression : class;
-        Task<IPage<TEntity>> SearchAsync<TSortExpression>(object parameters, IPage page, IOrderedEnumerable<ISortExpression<TSortExpression>> sort) where TSortExpression : class;
+        Task<IPage<TEntity>> SearchAsync(IReadOnlyCollection<IDataParameter> parameters, IPage page, IOrderedEnumerable<ISortExpression> sort);
+        Task<IPage<TEntity>> SearchAsync(object parameters, IPage page, IOrderedEnumerable<ISortExpression> sort);
     }
 }
diff --git a/src/YuckQi.Data/Sorting/Abstract/ISortExpression.cs b/src/YuckQi.Data/Sorting/Abstract/ISortExpression.cs
@@ -1,8 +1,8 @@
 namespace YuckQi.Data.Sorting.Abstract
 {
-    public interface ISortExpression<T> where T : class
+    public interface ISortExpression
     {
-        SortCriteria<T> Criteria { get; }
+        SortCriteria Criteria { get; }
 
         string GetSortExpression();
     }

diff --git a/src/YuckQi.Data/Sorting/SortCriteria.cs b/src/YuckQi.Data/Sorting/SortCriteria.cs
@@ -2,12 +2,12 @@
 
 namespace YuckQi.Data.Sorting
 {
-    public readonly struct SortCriteria<T> where T : class
+    public readonly struct SortCriteria
     {
-        public T Expression { get; }
+        public string Expression { get; }
         public SortOrder Order { get; }
 
-        public SortCriteria(T expression, SortOrder order)
+        public SortCriteria(string expression, SortOrder order)
         {
             Expression = expression ?? throw new ArgumentNullException(nameof(expression));
             Order = order;

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>0.4.0</Version>
+    <Version>0.4.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>A .NET library providing fine-grained data providers useful in data repository or domain service implementations.</Description>
   </PropertyGroup>