edited namespaces and added globalusing.

byerlikaya · Dec 2, 2023 · 7b908aa · 7b908aa
1 parent d8123cf
commit 7b908aa
Show file tree

Hide file tree

Showing 13 changed files with 544 additions and 573 deletions.
diff --git a/src/SmartWhere/Attributes/ComparativeWhereCaluseAttribute.cs b/src/SmartWhere/Attributes/ComparativeWhereCaluseAttribute.cs
@@ -1,15 +1,12 @@
-using SmartWhere.Enums;
+namespace SmartWhere.Attributes;
 
-namespace SmartWhere.Attributes
+public class ComparativeWhereCaluseAttribute : WhereClauseAttribute
 {
-    public class ComparativeWhereCaluseAttribute : WhereClauseAttribute
-    {
-        public ComparisonOperator ComparisonOperator { get; set; }
+    public ComparisonOperator ComparisonOperator { get; set; }
 
-        public ComparativeWhereCaluseAttribute(ComparisonOperator comparisonOperator, LogicalOperator logicalOperator = LogicalOperator.AND)
-            : base(logicalOperator) => ComparisonOperator = comparisonOperator;
+    public ComparativeWhereCaluseAttribute(ComparisonOperator comparisonOperator, LogicalOperator logicalOperator = LogicalOperator.AND)
+        : base(logicalOperator) => ComparisonOperator = comparisonOperator;
 
-        public ComparativeWhereCaluseAttribute(string propertyName, ComparisonOperator comparisonOperator, LogicalOperator logicalOperator = LogicalOperator.AND)
-            : base(propertyName, logicalOperator) => ComparisonOperator = comparisonOperator;
-    }
-}
+    public ComparativeWhereCaluseAttribute(string propertyName, ComparisonOperator comparisonOperator, LogicalOperator logicalOperator = LogicalOperator.AND)
+        : base(propertyName, logicalOperator) => ComparisonOperator = comparisonOperator;
+}
diff --git a/src/SmartWhere/Attributes/TextualWhereClauseAttribute.cs b/src/SmartWhere/Attributes/TextualWhereClauseAttribute.cs
@@ -1,15 +1,12 @@
-using SmartWhere.Enums;
+namespace SmartWhere.Attributes;
 
-namespace SmartWhere.Attributes
+public class TextualWhereClauseAttribute : WhereClauseAttribute
 {
-    public class TextualWhereClauseAttribute : WhereClauseAttribute
-    {
-        public StringMethod StringMethod { get; set; }
+    public StringMethod StringMethod { get; set; }
 
-        public TextualWhereClauseAttribute(StringMethod method, LogicalOperator logicalOperator = LogicalOperator.AND)
-            : base(logicalOperator) => StringMethod = method;
+    public TextualWhereClauseAttribute(StringMethod method, LogicalOperator logicalOperator = LogicalOperator.AND)
+        : base(logicalOperator) => StringMethod = method;
 
-        public TextualWhereClauseAttribute(string propertyName, StringMethod method, LogicalOperator logicalOperator = LogicalOperator.AND)
-            : base(propertyName, logicalOperator) => StringMethod = method;
-    }
-}
+    public TextualWhereClauseAttribute(string propertyName, StringMethod method, LogicalOperator logicalOperator = LogicalOperator.AND)
+        : base(propertyName, logicalOperator) => StringMethod = method;
+}
diff --git a/src/SmartWhere/Attributes/WhereClauseAttribute.cs b/src/SmartWhere/Attributes/WhereClauseAttribute.cs
@@ -1,21 +1,17 @@
-using SmartWhere.Enums;
-using System;
+namespace SmartWhere.Attributes;
 
-namespace SmartWhere.Attributes
+[AttributeUsage(AttributeTargets.Property)]
+public class WhereClauseAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Property)]
-    public class WhereClauseAttribute : Attribute
-    {
-        public string PropertyName { get; set; }
+    public string PropertyName { get; set; }
 
-        public LogicalOperator LogicalOperator { get; set; }
+    public LogicalOperator LogicalOperator { get; set; }
 
-        public WhereClauseAttribute(LogicalOperator logicalOperator = LogicalOperator.AND) => LogicalOperator = logicalOperator;
+    public WhereClauseAttribute(LogicalOperator logicalOperator = LogicalOperator.AND) => LogicalOperator = logicalOperator;
 
-        public WhereClauseAttribute(string propertyName, LogicalOperator logicalOperator = LogicalOperator.AND)
-        {
-            PropertyName = propertyName;
-            LogicalOperator = logicalOperator;
-        }
+    public WhereClauseAttribute(string propertyName, LogicalOperator logicalOperator = LogicalOperator.AND)
+    {
+        PropertyName = propertyName;
+        LogicalOperator = logicalOperator;
     }
-}
+}
diff --git a/src/SmartWhere/Attributes/WhereClauseClassAttribute.cs b/src/SmartWhere/Attributes/WhereClauseClassAttribute.cs
@@ -1,9 +1,6 @@
-using System;
+namespace SmartWhere.Attributes;
 
-namespace SmartWhere.Attributes
+[AttributeUsage(AttributeTargets.Property)]
+public class WhereClauseClassAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Property)]
-    public class WhereClauseClassAttribute : Attribute
-    {
-    }
-}
+}
diff --git a/src/SmartWhere/Enums/ComparisonOperator.cs b/src/SmartWhere/Enums/ComparisonOperator.cs
@@ -1,16 +1,15 @@
-namespace SmartWhere.Enums
+namespace SmartWhere.Enums;
+
+public enum ComparisonOperator
 {
-    public enum ComparisonOperator
-    {
-        Equal,
-        NotEqual,
-        GreaterThan,
-        NotGreaterThan,
-        GreaterThanOrEqual,
-        NotGreaterThanOrEqual,
-        LessThan,
-        NotLessThan,
-        LessThanOrEqual,
-        NotLessThanOrEqual
-    }
-}
+    Equal,
+    NotEqual,
+    GreaterThan,
+    NotGreaterThan,
+    GreaterThanOrEqual,
+    NotGreaterThanOrEqual,
+    LessThan,
+    NotLessThan,
+    LessThanOrEqual,
+    NotLessThanOrEqual
+}
diff --git a/src/SmartWhere/Enums/StringMethod.cs b/src/SmartWhere/Enums/StringMethod.cs
@@ -1,12 +1,11 @@
-namespace SmartWhere.Enums
+namespace SmartWhere.Enums;
+
+public enum StringMethod
 {
-    public enum StringMethod
-    {
-        Contains,
-        NotContains,
-        StartsWith,
-        NotStartsWith,
-        EndsWith,
-        NotEndsWith
-    }
-}
+    Contains,
+    NotContains,
+    StartsWith,
+    NotStartsWith,
+    EndsWith,
+    NotEndsWith
+}
diff --git a/src/SmartWhere/Extensions/AttributeExtensions.cs b/src/SmartWhere/Extensions/AttributeExtensions.cs
@@ -1,32 +1,27 @@
-using SmartWhere.Attributes;
-using SmartWhere.Enums;
-using System.Reflection;
+namespace SmartWhere.Extensions;
 
-namespace SmartWhere.Extensions
+internal static class AttributeExtensions
 {
-    public static class AttributeExtensions
-    {
-        internal static WhereClauseAttribute GetWhereClauseAttribute(this MemberInfo memberInfo) =>
-            (WhereClauseAttribute)memberInfo.GetCustomAttribute(typeof(WhereClauseAttribute), false);
+    internal static WhereClauseAttribute GetWhereClauseAttribute(this MemberInfo memberInfo) =>
+        (WhereClauseAttribute)memberInfo.GetCustomAttribute(typeof(WhereClauseAttribute), false);
 
-        internal static WhereClauseClassAttribute GetWhereClauseClassAttribute(this MemberInfo memberInfo) =>
-            (WhereClauseClassAttribute)memberInfo.GetCustomAttribute(typeof(WhereClauseClassAttribute), false);
+    internal static WhereClauseClassAttribute GetWhereClauseClassAttribute(this MemberInfo memberInfo) =>
+        (WhereClauseClassAttribute)memberInfo.GetCustomAttribute(typeof(WhereClauseClassAttribute), false);
 
-        internal static MethodInfo MethodInfo(this TextualWhereClauseAttribute textualWhereClause)
+    internal static MethodInfo MethodInfo(this TextualWhereClauseAttribute textualWhereClause)
+    {
+        var methodName = textualWhereClause.StringMethod switch
         {
-            var methodName = textualWhereClause.StringMethod switch
-            {
-                StringMethod.Contains => textualWhereClause.StringMethod.ToString(),
-                StringMethod.StartsWith => textualWhereClause.StringMethod.ToString(),
-                StringMethod.EndsWith => textualWhereClause.StringMethod.ToString(),
-                StringMethod.NotContains => nameof(StringMethod.Contains),
-                StringMethod.NotStartsWith => nameof(StringMethod.StartsWith),
-                StringMethod.NotEndsWith => nameof(StringMethod.EndsWith),
-                _ => nameof(StringMethod.Contains)
-            };
+            StringMethod.Contains => textualWhereClause.StringMethod.ToString(),
+            StringMethod.StartsWith => textualWhereClause.StringMethod.ToString(),
+            StringMethod.EndsWith => textualWhereClause.StringMethod.ToString(),
+            StringMethod.NotContains => nameof(StringMethod.Contains),
+            StringMethod.NotStartsWith => nameof(StringMethod.StartsWith),
+            StringMethod.NotEndsWith => nameof(StringMethod.EndsWith),
+            _ => nameof(StringMethod.Contains)
+        };
 
-            return typeof(string).GetMethod(methodName, new[] { typeof(string)
-    });
-        }
+        return typeof(string).GetMethod(methodName, new[] { typeof(string)
+        });
     }
-}
+}