Update CoR pattern examples

Author: nemanjarogic

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/Executor.cs

@@ -1,6 +1,6 @@
-using ChainOfResponsibilityLibrary.ApprovalExample;
-using ChainOfResponsibilityLibrary.LoggingExample;
+using ChainOfResponsibilityLibrary.LoggingExample;
 using ChainOfResponsibilityLibrary.PokerExample;
+using ChainOfResponsibilityLibrary.PurchaseApprovalExample;
 using DesignPatternsLibrary.PatternExecutors;
 
 namespace ChainOfResponsibilityLibrary;
@@ -15,4 +15,4 @@ public override void Execute()
         PokerExecutor.Execute();
         PurchaseApprovalExecutor.Execute();
     }
-}
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/LoggingExample/Common/Logger.cs

@@ -3,9 +3,9 @@
 public abstract class Logger
 {
     protected readonly LogLevel _loggerLevel;
-    protected Logger _next;
+    protected Logger? _next;
 
-    public Logger(LogLevel loggerLevel)
+    protected Logger(LogLevel loggerLevel)
     {
         _loggerLevel = loggerLevel;
     }
@@ -27,4 +27,4 @@ public void Log(LogLevel level, string message)
     }
 
     protected abstract void Write(string message);
-}
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/LoggingExample/Loggers/ConsoleLogger.cs

@@ -9,8 +9,5 @@ public ConsoleLogger()
     {
     }
 
-    protected override void Write(string message)
-    {
-        Console.WriteLine($"Console:: {message}");
-    }
-}
+    protected override void Write(string message) => Console.WriteLine($"Console:: {message}");
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/LoggingExample/Loggers/FileLogger.cs

@@ -9,8 +9,5 @@ public FileLogger()
     {
     }
 
-    protected override void Write(string message)
-    {
-        Console.WriteLine($"File:: {message}");
-    }
-}
+    protected override void Write(string message) => Console.WriteLine($"File:: {message}");
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/LoggingExample/Loggers/PriorityLogger.cs

@@ -9,8 +9,5 @@ public PriorityLogger()
     {
     }
 
-    protected override void Write(string message)
-    {
-        Console.WriteLine($"Priority monitoring logger:: {message}");
-    }
-}
+    protected override void Write(string message) => Console.WriteLine($"Priority monitoring logger:: {message}");
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/LoggingExample/LoggingExecutor.cs

@@ -12,17 +12,13 @@ public static void Execute()
 
         Logger loggerChain = InitializeLoggerChain();
 
-        var infoMessage = "This is information.";
-        var debugMessage = "This is debug level information.";
-        var errorMessage = "This is error information.";
-
-        loggerChain.Log(LogLevel.Info, infoMessage);
+        loggerChain.Log(LogLevel.Info, "This is information.");
         Console.WriteLine();
 
-        loggerChain.Log(LogLevel.Debug, debugMessage);
+        loggerChain.Log(LogLevel.Debug, "This is debug level information.");
         Console.WriteLine();
 
-        loggerChain.Log(LogLevel.Error, errorMessage);
+        loggerChain.Log(LogLevel.Error, "This is error information.");
         Console.WriteLine();
     }
 
@@ -38,4 +34,4 @@ private static Logger InitializeLoggerChain()
 
         return consoleLogger;
     }
-}
+}

…e/Categorizers/Common/HandCatagorizer.cs …e/Categorizers/Common/HandCategorizer.cssrc/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/PokerExample/Categorizers/Common/HandCatagorizer.cs renamed to src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/PokerExample/Categorizers/Common/HandCategorizer.cs src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/PokerExample/Categorizers/Common/HandCatagorizer.cs renamed to src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/PokerExample/Categorizers/Common/HandCategorizer.cs

@@ -3,23 +3,25 @@
 
 namespace ChainOfResponsibilityLibrary.PokerExample.Categorizers.Common;
 
-public abstract class HandCatagorizer
+public abstract class HandCategorizer
 {
-    protected HandCatagorizer Next { get; private set; }
+    protected HandCategorizer? Next { get; private set; }
 
-    public HandCatagorizer RegisterNext(HandCatagorizer next)
+    public HandCategorizer RegisterNext(HandCategorizer next)
     {
         Next = next;
         return Next;
     }
 
-    public abstract HandRanking Catagorize(Hand hand);
+    public abstract HandRanking Categorize(Hand hand);
+
+    protected HandRanking CheckNextCategorizer(Hand hand) => Next?.Categorize(hand) ?? HandRanking.HighCard;
 
     protected static bool HasNOfKind(int n, Hand hand)
     {
-        Dictionary<Value, int> seen = new Dictionary<Value, int>();
+        var seen = new Dictionary<Value, int>();
 
-        foreach (Card card in hand.Cards)
+        foreach (var card in hand.Cards)
         {
             if (seen.ContainsKey(card.Value))
             {
@@ -31,20 +33,12 @@ protected static bool HasNOfKind(int n, Hand hand)
             }
         }
 
-        foreach (int count in seen.Values)
-        {
-            if (count == n)
-            {
-                return true;
-            }
-        }
-
-        return false;
+        return seen.Values.Any(count => count == n);
     }
 
     protected static bool HasStraight(Hand hand)
     {
-        List<Value> values = hand.Cards.Select(card => card.Value).ToList();
+        var values = hand.Cards.Select(card => card.Value).ToList();
         values.Sort();
 
         var expectedValue = (int)values.First();
@@ -64,11 +58,10 @@ protected static bool HasStraight(Hand hand)
 
     protected static bool HasFlush(Hand hand)
     {
-        List<Suit> suits = hand.Cards.Select(card => card.Suit).ToList();
+        var suits = hand.Cards.Select(card => card.Suit).ToList();
         suits.Sort();
 
-        Suit expectedSuit = suits.First();
-
+        var expectedSuit = suits.First();
         return suits.All(suit => suit == expectedSuit);
     }
-}
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/PokerExample/Categorizers/FlushCategorizer.cs

@@ -4,15 +4,15 @@
 
 namespace ChainOfResponsibilityLibrary.PokerExample.Categorizers;
 
-public class FlushCategorizer : HandCatagorizer
+public class FlushCategorizer : HandCategorizer
 {
-    public override HandRanking Catagorize(Hand hand)
+    public override HandRanking Categorize(Hand hand)
     {
         if (HasFlush(hand))
         {
             return HandRanking.Flush;
         }
 
-        return Next.Catagorize(hand);
+        return CheckNextCategorizer(hand);
     }
-}
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/PokerExample/Categorizers/FourOfAKindCategorizer.cs

@@ -4,15 +4,15 @@
 
 namespace ChainOfResponsibilityLibrary.PokerExample.Categorizers;
 
-public class FourOfAKindCategorizer : HandCatagorizer
+public class FourOfAKindCategorizer : HandCategorizer
 {
-    public override HandRanking Catagorize(Hand hand)
+    public override HandRanking Categorize(Hand hand)
     {
         if (HasNOfKind(4, hand))
         {
             return HandRanking.FourOfAKind;
         }
 
-        return Next.Catagorize(hand);
+        return CheckNextCategorizer(hand);
     }
-}
+}

src/BehavioralPatterns/ChainOfResponsibility/ChainOfResponsibilityLibrary/PokerExample/Categorizers/FullHouseCategorizer.cs

@@ -4,13 +4,13 @@
 
 namespace ChainOfResponsibilityLibrary.PokerExample.Categorizers;
 
-public class FullHouseCategorizer : HandCatagorizer
+public class FullHouseCategorizer : HandCategorizer
 {
-    public override HandRanking Catagorize(Hand hand)
+    public override HandRanking Categorize(Hand hand)
     {
         var seen = new Dictionary<Value, int>();
 
-        foreach (Card card in hand.Cards)
+        foreach (var card in hand.Cards)
         {
             if (seen.ContainsKey(card.Value))
             {
@@ -30,6 +30,6 @@ public override HandRanking Catagorize(Hand hand)
             }
         }
 
-        return Next.Catagorize(hand);
+        return CheckNextCategorizer(hand);
     }
-}
+}