Initial Cleanup Before Refactor

AdapterPattern/IDuck.cs

@@ -1,8 +1,7 @@
-namespace AdapterPattern
+namespace AdapterPattern;
+
+public interface IDuck
 {
-    public interface IDuck
-    {
-        void Quack();
-        void Fly();
-    }
+    void Quack();
+    void Fly();
 }

AdapterPattern/ITurkey.cs

@@ -1,8 +1,7 @@
-namespace AdapterPattern
+namespace AdapterPattern;
+
+public interface ITurkey
 {
-    public interface ITurkey
-    {
-        void Gobble();
-        void Fly();
-    }
+    void Gobble();
+    void Fly();
 }

AdapterPattern/MallardDuck.cs

@@ -1,17 +1,14 @@
-using System;
+namespace AdapterPattern;
 
-namespace AdapterPattern
+class MallardDuck : IDuck
 {
-    class MallardDuck : IDuck
+    public void Quack()
     {
-        public void Quack()
-        {
-            Console.WriteLine("Quack Quack Quack");
-        }
+        Console.WriteLine("Quack Quack Quack");
+    }
 
-        public void Fly()
-        {
-            Console.WriteLine("Flies 500 Metres");
-        }
+    public void Fly()
+    {
+        Console.WriteLine("Flies 500 Metres");
     }
 }

AdapterPattern/Program.cs

@@ -1,20 +1,19 @@
 
-namespace AdapterPattern
+namespace AdapterPattern;
+
+internal static class Program
 {
-    internal static class Program
+    private static void Main()
     {
-        private static void Main()
-        {
-            var turkey = new WildTurkey();
-            var adapter = new TurkeyAdapter(turkey);
+        var turkey = new WildTurkey();
+        var adapter = new TurkeyAdapter(turkey);
 
-            Tester(adapter);
-        }
+        Tester(adapter);
+    }
 
-        private static void Tester(IDuck duck)
-        {
-            duck.Fly();
-            duck.Quack();
-        }
+    private static void Tester(IDuck duck)
+    {
+        duck.Fly();
+        duck.Quack();
     }
 }

AdapterPattern/TurkeyAdapter.cs

@@ -1,27 +1,24 @@
-using System;
+namespace AdapterPattern;
 
-namespace AdapterPattern
+public class TurkeyAdapter : IDuck
 {
-    public class TurkeyAdapter : IDuck
-    {
-        private readonly ITurkey _turkey;
+    private readonly ITurkey _turkey;
 
-        public TurkeyAdapter(ITurkey turkey)
-        {
-            _turkey = turkey;
-        }
-        public void Quack()
-        {
-            _turkey.Gobble();
-        }
+    public TurkeyAdapter(ITurkey turkey)
+    {
+        _turkey = turkey;
+    }
+    public void Quack()
+    {
+        _turkey.Gobble();
+    }
 
-        public void Fly()
+    public void Fly()
+    {
+        for (var i = 0; i < 5; i++)
         {
-            for (var i = 0; i < 5; i++)
-            {
-                _turkey.Fly();
-                Console.WriteLine("Resting..");
-            }
+            _turkey.Fly();
+            Console.WriteLine("Resting..");
         }
     }
 }

AdapterPattern/WildTurkey.cs

@@ -1,17 +1,14 @@
-using System;
+namespace AdapterPattern;
 
-namespace AdapterPattern
+class WildTurkey : ITurkey
 {
-    class WildTurkey : ITurkey
+    public void Gobble()
     {
-        public void Gobble()
-        {
-            Console.WriteLine("Gobble Gobble Gobble");
-        }
+        Console.WriteLine("Gobble Gobble Gobble");
+    }
 
-        public void Fly()
-        {
-            Console.WriteLine("Flies 100 Metres");
-        }
+    public void Fly()
+    {
+        Console.WriteLine("Flies 100 Metres");
     }
 }

BridgePattern/FlyingEnchantment.cs

@@ -1,22 +1,19 @@
-using System;
+namespace BridgePattern;
 
-namespace BridgePattern
+public class FlyingEnchantment : IEnchantment
 {
-    public class FlyingEnchantment : IEnchantment
+    public void OnActivate()
     {
-        public void OnActivate()
-        {
-            Console.WriteLine("The item begins to glow faintly.");
-        }
+        Console.WriteLine("The item begins to glow faintly.");
+    }
 
-        public void Apply()
-        {
-            Console.WriteLine("The item flies and strikes the enemies finally returning to owner's hand.");
-        }
+    public void Apply()
+    {
+        Console.WriteLine("The item flies and strikes the enemies finally returning to owner's hand.");
+    }
 
-        public void OnDeactivate()
-        {
-            Console.WriteLine("The item's glow fades.");
-        }
+    public void OnDeactivate()
+    {
+        Console.WriteLine("The item's glow fades.");
     }
 }

BridgePattern/Hammer.cs

@@ -1,36 +1,33 @@
-using System;
+namespace BridgePattern;
 
-namespace BridgePattern
+public class Hammer : IWeapon
 {
-    public class Hammer : IWeapon
+    private readonly IEnchantment _enchantment;
+    public Hammer(IEnchantment enchantment)
     {
-        private readonly IEnchantment _enchantment;
-        public Hammer(IEnchantment enchantment)
-        {
-            _enchantment = enchantment;
-        }
+        _enchantment = enchantment;
+    }
 
-        public void Wield()
-        {
-            Console.WriteLine("The hammer is wielded.");
-            _enchantment.OnActivate();
-        }
+    public void Wield()
+    {
+        Console.WriteLine("The hammer is wielded.");
+        _enchantment.OnActivate();
+    }
 
-        public void Swing()
-        {
-            Console.WriteLine("The hammer is swinged.");
-            _enchantment.Apply();
-        }
+    public void Swing()
+    {
+        Console.WriteLine("The hammer is swinged.");
+        _enchantment.Apply();
+    }
 
-        public void Unwield()
-        {
-            Console.WriteLine("The hammer is unwielded.");
-            _enchantment.OnDeactivate();
-        }
+    public void Unwield()
+    {
+        Console.WriteLine("The hammer is unwielded.");
+        _enchantment.OnDeactivate();
+    }
 
-        public IEnchantment GetEnchantment()
-        {
-            return _enchantment;
-        }
+    public IEnchantment GetEnchantment()
+    {
+        return _enchantment;
     }
 }

BridgePattern/IEnchantment.cs

@@ -1,9 +1,8 @@
-namespace BridgePattern
+namespace BridgePattern;
+
+public interface IEnchantment
 {
-    public interface IEnchantment
-    {
-        void OnActivate();
-        void Apply();
-        void OnDeactivate();
-    }
+    void OnActivate();
+    void Apply();
+    void OnDeactivate();
 }

BridgePattern/IWeapon.cs

@@ -1,10 +1,9 @@
-namespace BridgePattern
+namespace BridgePattern;
+
+public interface IWeapon
 {
-    public interface IWeapon
-    {
-        void Wield();
-        void Swing();
-        void Unwield();
-        IEnchantment GetEnchantment();
-    }
+    void Wield();
+    void Swing();
+    void Unwield();
+    IEnchantment GetEnchantment();
 }

BridgePattern/Program.cs

@@ -1,18 +1,17 @@
-namespace BridgePattern
+namespace BridgePattern;
+
+internal static class Program
 {
-    internal static class Program
+    private static void Main()
     {
-        private static void Main()
-        {
-            IWeapon sword = new Sword(new FlyingEnchantment());
-            sword.Wield();
-            sword.Swing();
-            sword.Unwield();
+        IWeapon sword = new Sword(new FlyingEnchantment());
+        sword.Wield();
+        sword.Swing();
+        sword.Unwield();
 
-            IWeapon hammer = new Hammer(new SoulEatingEnchantment());
-            hammer.Wield();
-            hammer.Swing();
-            hammer.Unwield();
-        }
+        IWeapon hammer = new Hammer(new SoulEatingEnchantment());
+        hammer.Wield();
+        hammer.Swing();
+        hammer.Unwield();
     }
 }

BridgePattern/SoulEatingEnchantment.cs

@@ -1,22 +1,19 @@
-using System;
+namespace BridgePattern;
 
-namespace BridgePattern
+public class SoulEatingEnchantment : IEnchantment
 {
-    public class SoulEatingEnchantment : IEnchantment
+    public void OnActivate()
     {
-        public void OnActivate()
-        {
-            Console.WriteLine("The item spreads bloodlust.");
-        }
+        Console.WriteLine("The item spreads bloodlust.");
+    }
 
-        public void Apply()
-        {
-            Console.WriteLine("The item eats the soul of enemies.");
-        }
+    public void Apply()
+    {
+        Console.WriteLine("The item eats the soul of enemies.");
+    }
 
-        public void OnDeactivate()
-        {
-            Console.WriteLine("Bloodlust slowly disappears.");
-        }
+    public void OnDeactivate()
+    {
+        Console.WriteLine("Bloodlust slowly disappears.");
     }
 }