Update flyweight pattern examples

Author: nemanjarogic

src/StructuralPatterns/Flyweight/FlyweightLibrary/DotNetStringExample/DotNetStringExecutor.cs

@@ -29,16 +29,16 @@ public static void Execute()
         Console.WriteLine($"s1 == s3 -> {ReferenceEquals(s1, s3)}");
 
         // We can make use of Console.ReadLine to accept a string at runtime, and assign it to s4.
-        // And a surprise, the output it false! By default .NET runtime doesn't replace runtime strings,
-        // which are instances.
+        // If you enter 'flyweight' after running the app, the output will be false!
+        // By default .NET runtime doesn't replace runtime strings, which are instances.
         // OUTPUT: false (if you enter 'flyweight')
         Console.WriteLine($"s1 == s4 -> {ReferenceEquals(s1, s4)}");
 
-        // While .NET runtime by default doesn't replace runtime strings, which are instances, we can still
-        // check if your string is present inside  the shared string pool by using string.Intern method.
+        // While .NET runtime by default doesn't replace runtime strings, we can still
+        // check if a runtime string is present inside the shared string pool by using string.Intern method.
         // Intern method is like the FlyweightFactory.
         // It returns a reference to an existing string if it is part of the pool.
         // OUTPUT: true (if you enter 'flyweight')
         Console.WriteLine($"s1 == s5 -> {ReferenceEquals(s1, s5)}");
     }
-}
+}

src/StructuralPatterns/Flyweight/FlyweightLibrary/ForestExample/Tree.cs

@@ -13,8 +13,5 @@ public Tree(double latitude, double longitude, TreeType treeType)
         _treeType = treeType;
     }
 
-    public void Render()
-    {
-        _treeType.Render(_latitude, _longitude);
-    }
-}
+    public void Render() => _treeType.Render(_latitude, _longitude);
+}

src/StructuralPatterns/Flyweight/FlyweightLibrary/ForestExample/TreeFactory.cs

@@ -18,19 +18,18 @@ public TreeType GetTreeType(string name, KnownColor color, string texture)
     {
         var key = GetTreeTypeKey(name, color, texture);
 
-        if (!_treeTypes.TryGetValue(key, out TreeType treeType))
+        if (_treeTypes.TryGetValue(key, out var treeType))
         {
-            treeType = new TreeType(name, color, texture);
-            _treeTypes.Add(key, treeType);
-
-            Console.WriteLine($"Registered new type: {name} tree with {color} color and {texture}");
+            Console.WriteLine($"Returning already initialized {name} tree with {color} color and {texture} from the tree factory...");
+            return treeType;
         }
 
+        treeType = new TreeType(name, color, texture);
+        _treeTypes.Add(key, treeType);
+        Console.WriteLine($"Registered new type: {name} tree with {color} color and {texture}");
+
         return treeType;
     }
 
-    private string GetTreeTypeKey(string name, KnownColor color, string texture)
-    {
-        return $"{name}-{color}-{texture}";
-    }
-}
+    private static string GetTreeTypeKey(string name, KnownColor color, string texture) => $"{name}-{color}-{texture}";
+}

src/StructuralPatterns/Flyweight/FlyweightLibrary/ForestExample/TreeType.cs

@@ -5,8 +5,7 @@ namespace FlyweightLibrary.ForestExample;
 /// <summary>
 /// The flyweight class contains a portion of the state of a <see cref="Tree"/>.
 /// These fields store values that are unique for each particular tree.
-/// For instance, you won't find here the tree coordinates, but the texture and colors
-/// shared between many trees are here.
+/// For instance, you won't find here the tree coordinates, but the texture and colors shared between many trees are here.
 /// Since this data is usually BIG, you'd waste a lot of memory by keeping it in each tree object.
 /// Instead, we can extract name, color, texture and other repeating data into a
 /// separate object which lots of individual tree objects can reference.
@@ -24,10 +23,8 @@ public TreeType(string name, KnownColor color, string texture)
         _texture = texture;
     }
 
-    public void Render(double latitude, double longitude)
-    {
+    public void Render(double latitude, double longitude) =>
         Console.WriteLine(
             $"{_name} tree with {_color} color and {_texture} is rendered " +
             $"at coordinates ({latitude}, {longitude})");
-    }
-}
+}