diff --git a/DotnetToolset.Patterns/Dddd/Enums/RuleType.cs b/DotnetToolset.Patterns/Dddd/Enums/RuleType.cs index 43e6416..efceeeb 100644 --- a/DotnetToolset.Patterns/Dddd/Enums/RuleType.cs +++ b/DotnetToolset.Patterns/Dddd/Enums/RuleType.cs @@ -1,4 +1,4 @@ -namespace DotnetToolset.Patterns.Dddd.Interfaces +namespace DotnetToolset.Patterns.Dddd.Enums { /// /// Types of rules diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/CurrencyRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/CurrencyRule.cs index 07d739b..4785f62 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/CurrencyRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/CurrencyRule.cs @@ -1,6 +1,7 @@ using DotnetToolset.ExtensionMethods; using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules @@ -11,8 +12,7 @@ public class CurrencyRule : IRule /// /// Constructor to set the rule value /// - /// - public CurrencyRule() + public CurrencyRule() { Rule = new KeyValuePair(RuleType.Currency, null); } @@ -28,13 +28,15 @@ public CurrencyRule() /// Data to be validated /// True if rule passed and an optional error message public (bool isValid, string errorMessage) Validate(object value) - { - if (value != null && (decimal)value >= 0) + { + if (value != null && (decimal)value >= 0) { return (true, null); } - return (false, Res.p_RuleCurrencyNotPassed.ParseParameters(new object[] { value?.ToString(), (decimal)value })); - } + if (value != null) + return (false, + Res.p_RuleCurrencyNotPassed.ParseParameters(new object[] { value?.ToString(), (decimal)value })); + } } } diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/GreaterThanSubjectRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/GreaterThanSubjectRule.cs index e225d2f..d83d6d6 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/GreaterThanSubjectRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/GreaterThanSubjectRule.cs @@ -1,5 +1,6 @@ using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules { diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsIntegerRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsIntegerRule.cs index 98ee67c..4286589 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsIntegerRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsIntegerRule.cs @@ -1,5 +1,6 @@ using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules @@ -27,7 +28,7 @@ public IsIntegerRule() /// True if rule passed and an optional error message public (bool isValid, string errorMessage) Validate(object value) { - if (value != null && int.TryParse(value.ToString(), out int parsedValue)) + if (value != null && int.TryParse(value.ToString(), out _)) { return (true, null); } diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsNotNullRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsNotNullRule.cs index 245656e..e41f586 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsNotNullRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/IsNotNullRule.cs @@ -1,5 +1,6 @@ using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/LowerThanSubjectRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/LowerThanSubjectRule.cs index 241f5aa..903208e 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/LowerThanSubjectRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/LowerThanSubjectRule.cs @@ -1,5 +1,6 @@ using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules { diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxLengthRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxLengthRule.cs index a42782c..72f1352 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxLengthRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxLengthRule.cs @@ -1,6 +1,7 @@ using DotnetToolset.ExtensionMethods; using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxRule.cs index 43e9219..e02209a 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MaxRule.cs @@ -1,6 +1,7 @@ using DotnetToolset.ExtensionMethods; using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinLengthRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinLengthRule.cs index 764b921..74ce8ba 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinLengthRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinLengthRule.cs @@ -1,6 +1,7 @@ using DotnetToolset.ExtensionMethods; using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinRule.cs index 2290992..2675e30 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/MinRule.cs @@ -1,6 +1,7 @@ using DotnetToolset.ExtensionMethods; using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/RangeRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/RangeRule.cs index d9d0ee5..602e8f8 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/RangeRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/RangeRule.cs @@ -1,6 +1,7 @@ using DotnetToolset.ExtensionMethods; using DotnetToolset.Patterns.Dddd.Interfaces; using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules diff --git a/DotnetToolset.Patterns/Dddd/Implementations/Rules/RegexRule.cs b/DotnetToolset.Patterns/Dddd/Implementations/Rules/RegexRule.cs index a87bd65..a081888 100644 --- a/DotnetToolset.Patterns/Dddd/Implementations/Rules/RegexRule.cs +++ b/DotnetToolset.Patterns/Dddd/Implementations/Rules/RegexRule.cs @@ -1,8 +1,8 @@ using DotnetToolset.ExtensionMethods; using DotnetToolset.Patterns.Dddd.Interfaces; -using System; using System.Collections.Generic; using System.Text.RegularExpressions; +using DotnetToolset.Patterns.Dddd.Enums; using Res = DotnetToolset.Patterns.Resources.Literals; namespace DotnetToolset.Patterns.Dddd.Implementations.Rules @@ -43,12 +43,12 @@ public RegexRule(string regex, bool skipWhenEmpty = false) return (true, Res.p_RuleRegexSkipped.ParseParameter(value.ToString())); } - if (!String.IsNullOrEmpty((string)value) && match.Success) + if (!string.IsNullOrEmpty((string)value) && match.Success) { return (true, null); } - return (false, Res.p_RuleRegexNotPassed.ParseParameters(new[] { value?.ToString(), Rule.Value })); + return (false, Res.p_RuleRegexNotPassed.ParseParameters(new[] { value.ToString(), Rule.Value })); } } } diff --git a/DotnetToolset.Patterns/Dddd/Interfaces/IRule.cs b/DotnetToolset.Patterns/Dddd/Interfaces/IRule.cs index c75a30b..9b4afe3 100644 --- a/DotnetToolset.Patterns/Dddd/Interfaces/IRule.cs +++ b/DotnetToolset.Patterns/Dddd/Interfaces/IRule.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using DotnetToolset.Patterns.Dddd.Enums; namespace DotnetToolset.Patterns.Dddd.Interfaces { diff --git a/DotnetToolset.Patterns/Dddd/Interfaces/IRuleset.cs b/DotnetToolset.Patterns/Dddd/Interfaces/IRuleset.cs index f022b71..18296c7 100644 --- a/DotnetToolset.Patterns/Dddd/Interfaces/IRuleset.cs +++ b/DotnetToolset.Patterns/Dddd/Interfaces/IRuleset.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using DotnetToolset.Patterns.Dddd.Enums; namespace DotnetToolset.Patterns.Dddd.Interfaces { diff --git a/DotnetToolset.Patterns/Dddd/Interfaces/IRulesetSubject.cs b/DotnetToolset.Patterns/Dddd/Interfaces/IRulesetSubject.cs index 52b3cbf..444df6c 100644 --- a/DotnetToolset.Patterns/Dddd/Interfaces/IRulesetSubject.cs +++ b/DotnetToolset.Patterns/Dddd/Interfaces/IRulesetSubject.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using DotnetToolset.Patterns.Dddd.Enums; namespace DotnetToolset.Patterns.Dddd.Interfaces { diff --git a/DotnetToolset.Patterns/DotnetToolset.Patterns.csproj b/DotnetToolset.Patterns/DotnetToolset.Patterns.csproj index 888738a..63d3aac 100644 --- a/DotnetToolset.Patterns/DotnetToolset.Patterns.csproj +++ b/DotnetToolset.Patterns/DotnetToolset.Patterns.csproj @@ -3,7 +3,7 @@ netstandard2.1 DotnetToolset.Patterns - 0.13.0 + 0.13.1 Ahead Labs, S.L. Opinionated miscellaneous patterns for multilayered .NET projects. Ahead Labs, S.L.