Update the simple factory example

Author: nemanjarogic

src/CreationalPatterns/AbstractFactory/MealSimpleFactory/Executor.cs

@@ -1,5 +1,6 @@
 using DesignPatternsLibrary.PatternExecutors;
 using MealSimpleFactory.Factories;
+using MealSimpleFactory.Meals;
 using MealSimpleFactory.Meals.Common;
 
 namespace MealSimpleFactory;
@@ -10,13 +11,20 @@ public class Executor : PatternExecutor
 
     public override void Execute()
     {
-        Console.WriteLine("Please enter desired meal name (green salad/hamburger): ");
-        string mealName = Console.ReadLine();
+        var response = string.Empty;
+        while (response is not "1" and not "2")
+        {
+            Console.WriteLine("Please choose the desired meal name (enter the number): ");
+            Console.WriteLine("1. Green salad");
+            Console.WriteLine("2. Hamburger");
+            response = Console.ReadLine()!;
+        }
 
-        MealFactory factory = new MealFactory();
-        IMeal meal = factory.CreateMeal(mealName);
+        var mealName = response == "1" ? nameof(GreenSalad) : nameof(Hamburger);
+        var factory = new MealFactory();
 
+        IMeal meal = factory.CreateMeal(mealName);
         meal.ShowDescription();
         meal.ShowAmountOfCalories();
     }
-}
+}

src/CreationalPatterns/AbstractFactory/MealSimpleFactory/Factories/MealFactory.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Globalization;
+using System.Reflection;
 using MealSimpleFactory.Meals;
 using MealSimpleFactory.Meals.Common;
 
@@ -10,7 +11,7 @@ namespace MealSimpleFactory.Factories;
 /// </summary>
 public class MealFactory
 {
-    private Dictionary<string, Type> _meals;
+    private readonly Dictionary<string, Type> _meals = new();
 
     public MealFactory()
     {
@@ -25,18 +26,11 @@ public IMeal CreateMeal(string mealName)
             return new NullMeal();
         }
 
-        return Activator.CreateInstance(type) as IMeal;
+        return (Activator.CreateInstance(type) as IMeal)!;
     }
 
-    private Type GetTypeForCreation(string mealName)
-    {
-        if (!_meals.TryGetValue(mealName, out Type type))
-        {
-            return null;
-        }
-
-        return type;
-    }
+    private Type? GetTypeForCreation(string mealName) =>
+        _meals.TryGetValue(mealName, out var type) ? type : null;
 
     /// <summary>
     /// Load available meal types.
@@ -45,16 +39,14 @@ private Type GetTypeForCreation(string mealName)
     /// </summary>
     private void LoadAvailableMealTypes()
     {
-        _meals = new Dictionary<string, Type>();
-
         Type[] assemblyTypes = Assembly.GetExecutingAssembly().GetTypes();
 
         foreach (Type type in assemblyTypes)
         {
             if (type.GetInterface(typeof(IMeal).ToString()) != null)
             {
-                _meals.Add(type.Name.ToLower(), type);
+                _meals.Add(type.Name, type);
             }
         }
     }
-}
+}

src/CreationalPatterns/AbstractFactory/MealSimpleFactory/Meals/Common/IMeal.cs

@@ -5,4 +5,4 @@ public interface IMeal
     void ShowAmountOfCalories();
 
     void ShowDescription();
-}
+}

src/CreationalPatterns/AbstractFactory/MealSimpleFactory/Meals/GreenSalad.cs

@@ -4,13 +4,9 @@ namespace MealSimpleFactory.Meals;
 
 public class GreenSalad : IMeal
 {
-    public void ShowAmountOfCalories()
-    {
+    public void ShowAmountOfCalories() =>
         Console.WriteLine("Calories: 250 kcal");
-    }
 
-    public void ShowDescription()
-    {
+    public void ShowDescription() =>
         Console.WriteLine("Green salad: lettuce, cucumber and green olives");
-    }
-}
+}

src/CreationalPatterns/AbstractFactory/MealSimpleFactory/Meals/Hamburger.cs

@@ -4,13 +4,9 @@ namespace MealSimpleFactory.Meals;
 
 public class Hamburger : IMeal
 {
-    public void ShowAmountOfCalories()
-    {
+    public void ShowAmountOfCalories() =>
         Console.WriteLine("Calories: 450 kcal");
-    }
 
-    public void ShowDescription()
-    {
+    public void ShowDescription() =>
         Console.WriteLine("Hamburger: beef meat, Worcestershire sauce and cheese.");
-    }
-}
+}

src/CreationalPatterns/AbstractFactory/MealSimpleFactory/Meals/NullMeal.cs

@@ -11,4 +11,4 @@ public void ShowAmountOfCalories()
     public void ShowDescription()
     {
     }
-}
+}