From 7338ba11f3919742820cd78817b0a2eb92e5e7a0 Mon Sep 17 00:00:00 2001 From: Dennis Oehme Date: Thu, 4 Jan 2024 20:48:04 +0100 Subject: [PATCH] style: remove AddWhiteSpaceBeforeToLower --- Extensions/BooleanExtensions.cs | 4 ++-- Extensions/CollectionExpressions.cs | 2 +- Extensions/DateTimeExtensions.cs | 9 +++++---- Extensions/NumericExtensions.cs | 21 +++++++-------------- Extensions/StringExtensions.cs | 25 ++++--------------------- 5 files changed, 19 insertions(+), 42 deletions(-) diff --git a/Extensions/BooleanExtensions.cs b/Extensions/BooleanExtensions.cs index 59c810c..fca4e2f 100644 --- a/Extensions/BooleanExtensions.cs +++ b/Extensions/BooleanExtensions.cs @@ -6,13 +6,13 @@ public static class BooleanExtensions { public static IValue IsTrue(this IBooleanEvaluator value) { - value.Filter.Append(StringExtensions.AddWhiteSpaceBeforeToLower("= true")); + value.Filter.Append(" = true"); return (IValue)value; } public static IValue IsFalse(this IBooleanEvaluator value) { - value.Filter.Append(StringExtensions.AddWhiteSpaceBeforeToLower("= false")); + value.Filter.Append(" = false"); return (IValue)value; } } diff --git a/Extensions/CollectionExpressions.cs b/Extensions/CollectionExpressions.cs index 34f7b9f..8b4a899 100644 --- a/Extensions/CollectionExpressions.cs +++ b/Extensions/CollectionExpressions.cs @@ -6,7 +6,7 @@ public static class CollectionExpressions { public static IValue Contains(this ICollectionEvaluator value, TData itemToSearch) { - value.Filter.Append(StringExtensions.AddWhiteSpaceBeforeToLower($"= '{itemToSearch}'")); + value.Filter.Append($" = '{itemToSearch}'"); return (IValue)value; } } diff --git a/Extensions/DateTimeExtensions.cs b/Extensions/DateTimeExtensions.cs index 6723587..0117112 100644 --- a/Extensions/DateTimeExtensions.cs +++ b/Extensions/DateTimeExtensions.cs @@ -6,20 +6,21 @@ public static class DateTimeExtensions { public static IValue After(this IDateTimeEvaluator value, DateTime dateTime) { - value.Filter.Append(StringExtensions.AddWhiteSpaceBeforeToLower($"> {dateTime.ToUnixEpoch()}")); + value.Filter.Append($" > {dateTime.ToUnixEpoch()}"); return (IValue)value; } public static IValue AfterOrEqual(this IDateTimeEvaluator value, DateTime dateTime) { - value.Filter.Append(StringExtensions.AddWhiteSpaceBeforeToLower($">= {dateTime}")); + value.Filter.Append($" >= {dateTime}"); return (IValue)value; } public static double ToUnixEpoch(this DateTime date) { - DateTime origin = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc); - TimeSpan diff = date.ToUniversalTime() - origin; + var origin = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc); + var diff = date.ToUniversalTime() - origin; + return Math.Floor(diff.TotalSeconds); } } diff --git a/Extensions/NumericExtensions.cs b/Extensions/NumericExtensions.cs index 50aeb5e..e405c4b 100644 --- a/Extensions/NumericExtensions.cs +++ b/Extensions/NumericExtensions.cs @@ -7,50 +7,43 @@ public static class NumericExtensions { public static IValue IsEqual(this INumbersEvaluator value, decimal number) { - value.Filter.Append( - StringExtensions.AddWhiteSpaceBeforeToLower($"= {number.ToString(CultureInfo.InvariantCulture)}")); + value.Filter.Append($" = {number.ToString(CultureInfo.InvariantCulture)}"); return (IValue)value; } public static IValue IsNotEqual(this INumbersEvaluator value, int number) { - value.Filter.Append( - StringExtensions.AddWhiteSpaceBeforeToLower($"!= {number.ToString(CultureInfo.InvariantCulture)}")); + value.Filter.Append($" != {number.ToString(CultureInfo.InvariantCulture)}"); return (IValue)value; } public static IValue GreaterThan(this INumbersEvaluator value, int number) { - value.Filter.Append( - StringExtensions.AddWhiteSpaceBeforeToLower($"> {number.ToString(CultureInfo.InvariantCulture)}")); + value.Filter.Append($" > {number.ToString(CultureInfo.InvariantCulture)}"); return (IValue)value; } public static IValue GreaterThanOrEquals(this INumbersEvaluator value, int number) { - value.Filter.Append( - StringExtensions.AddWhiteSpaceBeforeToLower($">= {number.ToString(CultureInfo.InvariantCulture)}")); + value.Filter.Append($" >= {number.ToString(CultureInfo.InvariantCulture)}"); return (IValue)value; } public static IValue GreaterThanOrEquals(this INumbersEvaluator value, double number) { - value.Filter.Append( - StringExtensions.AddWhiteSpaceBeforeToLower($">= {number.ToString(CultureInfo.InvariantCulture)}")); + value.Filter.Append($" >= {number.ToString(CultureInfo.InvariantCulture)}"); return (IValue)value; } public static IValue LowerThanOrEquals(this INumbersEvaluator value, int number) { - value.Filter.Append( - StringExtensions.AddWhiteSpaceBeforeToLower($"<= {number.ToString(CultureInfo.InvariantCulture)}")); + value.Filter.Append($" <= {number.ToString(CultureInfo.InvariantCulture)}"); return (IValue)value; } public static IValue LowerThan(this INumbersEvaluator value, int number) { - value.Filter.Append( - StringExtensions.AddWhiteSpaceBeforeToLower($"< {number.ToString(CultureInfo.InvariantCulture)}")); + value.Filter.Append($" < {number.ToString(CultureInfo.InvariantCulture)}"); return (IValue)value; } } diff --git a/Extensions/StringExtensions.cs b/Extensions/StringExtensions.cs index f5ea210..4de1693 100644 --- a/Extensions/StringExtensions.cs +++ b/Extensions/StringExtensions.cs @@ -12,44 +12,27 @@ public static string FirstCharToLowerCase(this string str) return str; } - public static string AddWhiteSpaceBeforeToLower(object value) - { - var originalText = " " + value.ToString()!.FirstCharToLowerCase(); - return originalText; - } - public static IValue ExactSame(this IStringsEvaluator value, string text) { - value.Filter.Append(AddWhiteSpaceBeforeToLower($"= '{text}'")); + value.Filter.Append($" = '{text}'"); return (IValue)value; } public static IValue NotExactSame(this IStringsEvaluator value, string text) { - value.Filter.Append(AddWhiteSpaceBeforeToLower($"!= '{text}'")); + value.Filter.Append($" != '{text}'"); return (IValue)value; } public static IValue IsEmpty(this IStringsEvaluator value) { - value.Filter.Append(AddWhiteSpaceBeforeToLower("IS EMPTY")); + value.Filter.Append(" IS EMPTY"); return (IValue)value; } public static IValue IsNotEmpty(this IStringsEvaluator value) { - value.Filter.Append(AddWhiteSpaceBeforeToLower("IS NOT EMPTY")); - return (IValue)value; - } - public static IValue IsNull(this IStringsEvaluator value) - { - value.Filter.Append(AddWhiteSpaceBeforeToLower("IS NULL")); - return (IValue)value; - } - - public static IValue IsNotNull(this IStringsEvaluator value) - { - value.Filter.Append(AddWhiteSpaceBeforeToLower("IS NOT NULL")); + value.Filter.Append(" IS NOT EMPTY"); return (IValue)value; } }