From 6652ada702577a83ad57fb3e98d494f8db36fad5 Mon Sep 17 00:00:00 2001 From: Biarity Date: Sun, 17 Nov 2019 08:51:13 +1000 Subject: [PATCH] Style fixes --- Sieve/Attributes/SieveAttribute.cs | 6 +++--- Sieve/Extensions/MethodInfoExtended.cs | 4 +--- Sieve/Extensions/OrderByDynamic.cs | 10 +++++----- Sieve/Models/FilterOperator.cs | 2 +- Sieve/Models/ISieveModel.cs | 3 +-- Sieve/Models/ISievePropertyMetadata.cs | 2 +- Sieve/Models/ISortTerm.cs | 2 +- Sieve/Models/SieveModel.cs | 3 +-- Sieve/Models/SieveOptions.cs | 2 +- Sieve/Models/SievePropertyMetadata.cs | 2 +- Sieve/Models/SortTerm.cs | 2 +- Sieve/Services/ISieveCustomFilterMethods.cs | 2 +- Sieve/Services/ISieveCustomSortMethods.cs | 2 +- Sieve/Services/SieveProcessor.cs | 6 +++--- Sieve/Services/SievePropertyMapper.cs | 8 ++++---- 15 files changed, 26 insertions(+), 30 deletions(-) diff --git a/Sieve/Attributes/SieveAttribute.cs b/Sieve/Attributes/SieveAttribute.cs index 19fbb08..ffde11a 100644 --- a/Sieve/Attributes/SieveAttribute.cs +++ b/Sieve/Attributes/SieveAttribute.cs @@ -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 { /// diff --git a/Sieve/Extensions/MethodInfoExtended.cs b/Sieve/Extensions/MethodInfoExtended.cs index d7aff02..5652133 100644 --- a/Sieve/Extensions/MethodInfoExtended.cs +++ b/Sieve/Extensions/MethodInfoExtended.cs @@ -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) diff --git a/Sieve/Extensions/OrderByDynamic.cs b/Sieve/Extensions/OrderByDynamic.cs index f014229..5a885de 100644 --- a/Sieve/Extensions/OrderByDynamic.cs +++ b/Sieve/Extensions/OrderByDynamic.cs @@ -5,17 +5,17 @@ using System.Reflection; namespace Sieve.Extensions { - public static partial class LinqExtentions + public static partial class LinqExtentions { public static IQueryable OrderByDynamic(this IQueryable 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 }, diff --git a/Sieve/Models/FilterOperator.cs b/Sieve/Models/FilterOperator.cs index f92c163..c691527 100644 --- a/Sieve/Models/FilterOperator.cs +++ b/Sieve/Models/FilterOperator.cs @@ -1,6 +1,6 @@ namespace Sieve.Models { - public enum FilterOperator + public enum FilterOperator { Equals, NotEquals, diff --git a/Sieve/Models/ISieveModel.cs b/Sieve/Models/ISieveModel.cs index 9fb8221..0b76f4b 100644 --- a/Sieve/Models/ISieveModel.cs +++ b/Sieve/Models/ISieveModel.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace Sieve.Models { diff --git a/Sieve/Models/ISievePropertyMetadata.cs b/Sieve/Models/ISievePropertyMetadata.cs index f12f6d9..e6e22f7 100644 --- a/Sieve/Models/ISievePropertyMetadata.cs +++ b/Sieve/Models/ISievePropertyMetadata.cs @@ -1,6 +1,6 @@ namespace Sieve.Models { - public interface ISievePropertyMetadata + public interface ISievePropertyMetadata { string Name { get; set; } string FullName { get; } diff --git a/Sieve/Models/ISortTerm.cs b/Sieve/Models/ISortTerm.cs index 24f352c..f337000 100644 --- a/Sieve/Models/ISortTerm.cs +++ b/Sieve/Models/ISortTerm.cs @@ -1,6 +1,6 @@ namespace Sieve.Models { - public interface ISortTerm + public interface ISortTerm { string Sort { set; } bool Descending { get; } diff --git a/Sieve/Models/SieveModel.cs b/Sieve/Models/SieveModel.cs index 483a569..c17910e 100644 --- a/Sieve/Models/SieveModel.cs +++ b/Sieve/Models/SieveModel.cs @@ -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; diff --git a/Sieve/Models/SieveOptions.cs b/Sieve/Models/SieveOptions.cs index fc866f0..f0059ee 100644 --- a/Sieve/Models/SieveOptions.cs +++ b/Sieve/Models/SieveOptions.cs @@ -1,6 +1,6 @@ namespace Sieve.Models { - public class SieveOptions + public class SieveOptions { public bool CaseSensitive { get; set; } = false; diff --git a/Sieve/Models/SievePropertyMetadata.cs b/Sieve/Models/SievePropertyMetadata.cs index 783f554..356c706 100644 --- a/Sieve/Models/SievePropertyMetadata.cs +++ b/Sieve/Models/SievePropertyMetadata.cs @@ -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; } diff --git a/Sieve/Models/SortTerm.cs b/Sieve/Models/SortTerm.cs index 9299966..92577b2 100644 --- a/Sieve/Models/SortTerm.cs +++ b/Sieve/Models/SortTerm.cs @@ -7,7 +7,7 @@ namespace Sieve.Models public SortTerm() { } private string _sort; - + public string Sort { set diff --git a/Sieve/Services/ISieveCustomFilterMethods.cs b/Sieve/Services/ISieveCustomFilterMethods.cs index 1e3bd42..d79deea 100644 --- a/Sieve/Services/ISieveCustomFilterMethods.cs +++ b/Sieve/Services/ISieveCustomFilterMethods.cs @@ -1,6 +1,6 @@ namespace Sieve.Services { - public interface ISieveCustomFilterMethods + public interface ISieveCustomFilterMethods { } } diff --git a/Sieve/Services/ISieveCustomSortMethods.cs b/Sieve/Services/ISieveCustomSortMethods.cs index cacd9c0..37f4c42 100644 --- a/Sieve/Services/ISieveCustomSortMethods.cs +++ b/Sieve/Services/ISieveCustomSortMethods.cs @@ -1,6 +1,6 @@ namespace Sieve.Services { - public interface ISieveCustomSortMethods + public interface ISieveCustomSortMethods { } } diff --git a/Sieve/Services/SieveProcessor.cs b/Sieve/Services/SieveProcessor.cs index cf54d31..cec6bdf 100644 --- a/Sieve/Services/SieveProcessor.cs +++ b/Sieve/Services/SieveProcessor.cs @@ -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(canSortRequired, canFilterRequired, name, _options.Value.CaseSensitive); - if(property.Item1 == null) + if (property.Item1 == null) { var prop = FindPropertyBySieveAttribute(canSortRequired, canFilterRequired, name, _options.Value.CaseSensitive); return (prop?.Name, prop); } return property; - + } private PropertyInfo FindPropertyBySieveAttribute( diff --git a/Sieve/Services/SievePropertyMapper.cs b/Sieve/Services/SievePropertyMapper.cs index c3b8fc2..e579d0a 100644 --- a/Sieve/Services/SievePropertyMapper.cs +++ b/Sieve/Services/SievePropertyMapper.cs @@ -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>> _map = new Dictionary>>(); public PropertyFluentApi Property(Expression> expression) { - if(!_map.ContainsKey(typeof(TEntity))) + if (!_map.ContainsKey(typeof(TEntity))) { _map.Add(typeof(TEntity), new List>()); }