public-mirrors/Sieve
1
0
Fork 0
mirror of https://github.com/Biarity/Sieve.git synced 2024-11-21 13:02:46 +01:00
Code Issues Projects Releases Wiki Activity

Style fixes

Browse Source
This commit is contained in:
Biarity 2019-11-17 08:51:13 +10:00
parent a582c6be06
commit 6652ada702
15 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sieve/Attributes/SieveAttribute.cs
View File

@ -1,9 +1,9 @@
using Sieve.Models;
using System;
using System;
using Sieve.Models;
namespace Sieve.Attributes
{
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
public class SieveAttribute : Attribute, ISievePropertyMetadata
{
/// <summary>

4
Sieve/Extensions/MethodInfoExtended.cs
View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
namespace Sieve.Extensions
{
@ -74,7 +72,7 @@ namespace Sieve.Extensions
// Check that the parameter counts and types match,
// with 'loose' matching on generic parameters
ParameterInfo[] parameterInfos = methodInfo.GetParameters();
if (parameterInfos[0].ParameterType.IsSimilarType(firstType))
{
if (matchingMethod == null)

10
Sieve/Extensions/OrderByDynamic.cs
View File

@ -5,17 +5,17 @@ using System.Reflection;
namespace Sieve.Extensions
{
public static partial class LinqExtentions
public static partial class LinqExtentions
{
public static IQueryable<TEntity> OrderByDynamic<TEntity>(this IQueryable<TEntity> source, string fullPropertyName, PropertyInfo propertyInfo,
bool desc, bool useThenBy)
{
string command = desc ?
( useThenBy ? "ThenByDescending" : "OrderByDescending") :
( useThenBy ? "ThenBy" : "OrderBy");
(useThenBy ? "ThenByDescending" : "OrderByDescending") :
(useThenBy ? "ThenBy" : "OrderBy");
var type = typeof(TEntity);
var parameter = Expression.Parameter(type, "p");
dynamic propertyValue = parameter;
if (fullPropertyName.Contains("."))
{
@ -25,7 +25,7 @@ namespace Sieve.Extensions
propertyValue = Expression.PropertyOrField(propertyValue, parts[i]);
}
}
var propertyAccess = Expression.MakeMemberAccess(propertyValue, propertyInfo);
var orderByExpression = Expression.Lambda(propertyAccess, parameter);
var resultExpression = Expression.Call(typeof(Queryable), command, new Type[] { type, propertyInfo.PropertyType },

2
Sieve/Models/FilterOperator.cs
View File

@ -1,6 +1,6 @@
namespace Sieve.Models
{
public enum FilterOperator
public enum FilterOperator
{
Equals,
NotEquals,

3
Sieve/Models/ISieveModel.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
namespace Sieve.Models
{

2
Sieve/Models/ISievePropertyMetadata.cs
View File

@ -1,6 +1,6 @@
namespace Sieve.Models
{
public interface ISievePropertyMetadata
public interface ISievePropertyMetadata
{
string Name { get; set; }
string FullName { get; }

2
Sieve/Models/ISortTerm.cs
View File

@ -1,6 +1,6 @@
namespace Sieve.Models
{
public interface ISortTerm
public interface ISortTerm
{
string Sort { set; }
bool Descending { get; }

3
Sieve/Models/SieveModel.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;

2
Sieve/Models/SieveOptions.cs
View File

@ -1,6 +1,6 @@
namespace Sieve.Models
{
public class SieveOptions
public class SieveOptions
{
public bool CaseSensitive { get; set; } = false;

2
Sieve/Models/SievePropertyMetadata.cs
View File

@ -1,6 +1,6 @@
namespace Sieve.Models
{
public class SievePropertyMetadata : ISievePropertyMetadata
public class SievePropertyMetadata : ISievePropertyMetadata
{
public string Name { get; set; }
public string FullName { get; set; }

2
Sieve/Models/SortTerm.cs
View File

@ -7,7 +7,7 @@ namespace Sieve.Models
public SortTerm() { }
private string _sort;
public string Sort
{
set

2
Sieve/Services/ISieveCustomFilterMethods.cs
View File

@ -1,6 +1,6 @@
namespace Sieve.Services
{
public interface ISieveCustomFilterMethods
public interface ISieveCustomFilterMethods
{
}
}

2
Sieve/Services/ISieveCustomSortMethods.cs
View File

@ -1,6 +1,6 @@
namespace Sieve.Services
{
public interface ISieveCustomSortMethods
public interface ISieveCustomSortMethods
{
}
}

6
Sieve/Services/SieveProcessor.cs
View File

@ -227,7 +227,7 @@ namespace Sieve.Services
}
else
{
result = ApplyCustomMethod(result, filterTermName, _customFilterMethods,
result = ApplyCustomMethod(result, filterTermName, _customFilterMethods,
new object[] {
result,
filterTerm.Operator,
@ -356,13 +356,13 @@ namespace Sieve.Services
string name)
{
var property = mapper.FindProperty<TEntity>(canSortRequired, canFilterRequired, name, _options.Value.CaseSensitive);
if(property.Item1 == null)
if (property.Item1 == null)
{
var prop = FindPropertyBySieveAttribute<TEntity>(canSortRequired, canFilterRequired, name, _options.Value.CaseSensitive);
return (prop?.Name, prop);
}
return property;
}
private PropertyInfo FindPropertyBySieveAttribute<TEntity>(

8
Sieve/Services/SievePropertyMapper.cs
View File

@ -1,20 +1,20 @@
using Sieve.Models;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using Sieve.Models;
namespace Sieve.Services
{
public class SievePropertyMapper
public class SievePropertyMapper
{
private readonly Dictionary<Type, ICollection<KeyValuePair<PropertyInfo, ISievePropertyMetadata>>> _map
= new Dictionary<Type, ICollection<KeyValuePair<PropertyInfo, ISievePropertyMetadata>>>();
public PropertyFluentApi<TEntity> Property<TEntity>(Expression<Func<TEntity, object>> expression)
{
if(!_map.ContainsKey(typeof(TEntity)))
if (!_map.ContainsKey(typeof(TEntity)))
{
_map.Add(typeof(TEntity), new List<KeyValuePair<PropertyInfo, ISievePropertyMetadata>>());
}