Use primary constructors

Author: davidwengier

src/Trains.Emoji/Program.cs

@@ -5,15 +5,20 @@
 
 namespace Trains.Emoji;
 
-public class EmojiDrawer
+public class EmojiDrawer(
+    IRenderer<Tree> treeRenderer,
+    IEnumerable<IRenderer<Track>> trackRenderers,
+    IRenderer<Train> trainRenderer,
+    IPixelMapper pixelMapper)
 {
     private static int s_numberOfTrainsToDraw = 6;
     private static int s_numberOfTreesToDraw = 3;
 
-    private readonly IRenderer<Tree> _treeRenderer;
-    private readonly IEnumerable<IRenderer<Track>> _trackRenderers;
-    private readonly IRenderer<Train> _trainRenderer;
-    private readonly IPixelMapper _pixelMapper;
+    private readonly IRenderer<Tree> _treeRenderer = treeRenderer;
+    private readonly IEnumerable<IRenderer<Track>> _trackRenderers = trackRenderers;
+    private readonly IRenderer<Train> _trainRenderer = trainRenderer;
+    private readonly IPixelMapper _pixelMapper = pixelMapper;
+
     private const string BaseFolderName = "EmojiOutput";
 
     public static void Main(string[] args)
@@ -47,14 +52,6 @@ static bool IsArg(string actual, string expected)
             || string.Equals(actual, "-" + expected, StringComparison.OrdinalIgnoreCase);
     }
 
-    public EmojiDrawer(IRenderer<Tree> treeRenderer, IEnumerable<IRenderer<Track>> trackRenderers, IRenderer<Train> trainRenderer, IPixelMapper pixelMapper)
-    {
-        _treeRenderer = treeRenderer;
-        _trackRenderers = trackRenderers;
-        _trainRenderer = trainRenderer;
-        _pixelMapper = pixelMapper;
-    }
-
     public void Save(IEnumerable<int> imageSizes)
     {
         if (Directory.Exists(BaseFolderName))

src/Trains.NET.Engine/Entity/Layout.cs

@@ -3,20 +3,15 @@
 
 namespace Trains.NET.Engine;
 
-public class Layout : ILayout, IInitializeAsync, IGameState, IGameStep
+public class Layout(IEntityCollectionSerializer gameSerializer) : ILayout, IInitializeAsync, IGameState, IGameStep
 {
     public event EventHandler? CollectionChanged;
 
     private readonly object _gate = new object();
-    private readonly IEntityCollectionSerializer _gameSerializer;
+    private readonly IEntityCollectionSerializer _gameSerializer = gameSerializer;
     private IStaticEntity?[][] _entities = null!;
     private int _rows;
 
-    public Layout(IEntityCollectionSerializer gameSerializer)
-    {
-        _gameSerializer = gameSerializer;
-    }
-
     public Task InitializeAsync(int columns, int rows)
     {
         _entities = new IStaticEntity[columns][];

src/Trains.NET.Engine/Entity/MovableLayout.cs

@@ -2,25 +2,18 @@
 
 namespace Trains.NET.Engine;
 
-public class MovableLayout : IMovableLayout, IGameState, IGameStep
+public class MovableLayout(ILayout layout, IEntityCollectionSerializer gameSerializer) : IMovableLayout, IGameState, IGameStep
 {
     private ImmutableList<IMovable> _movables = ImmutableList<IMovable>.Empty;
     private Dictionary<Track, (Train, float)> _lastTrackLeases = new();
-    private readonly ILayout _layout;
-    private readonly IEntityCollectionSerializer _gameSerializer;
-    private readonly Train _reservedTrain;
+    private readonly ILayout _layout = layout;
+    private readonly IEntityCollectionSerializer _gameSerializer = gameSerializer;
+    private readonly Train _reservedTrain = new Train(0);
 
     public int Count => _movables.Count;
 
     public IMovable this[int index] => _movables[index];
 
-    public MovableLayout(ILayout layout, IEntityCollectionSerializer gameSerializer)
-    {
-        _layout = layout;
-        _gameSerializer = gameSerializer;
-        _reservedTrain = new Train(0);
-    }
-
     public int IndexOf(IMovable movable)
         => _movables.IndexOf(movable);
 

src/Trains.NET.Engine/GameState/GameStateManager.cs

@@ -4,16 +4,19 @@
 namespace Trains.NET.Engine;
 
 [Order(999999)]
-public class GameStateManager : IGameStateManager, IInitializeAsync, IGameStep
+public class GameStateManager(
+    IEnumerable<IGameState> gameStates,
+    IGameStorage storage)
+    : IGameStateManager, IInitializeAsync, IGameStep
 {
     // Auto-save every 2 seconds
     private const int AutosaveInterval = 2 * 60;
 
     private int _autosaveCounter;
     private bool _autosaveEnabled;
 
-    private readonly IEnumerable<IGameState> _gameStates;
-    private readonly IGameStorage _storage;
+    private readonly IEnumerable<IGameState> _gameStates = gameStates;
+    private readonly IGameStorage _storage = storage;
     private readonly InformationStat _autosaveStat = InstrumentationBag.Add<InformationStat>("Autosave");
     private readonly ElapsedMillisecondsTimedStat _saveTimeStat = InstrumentationBag.Add<ElapsedMillisecondsTimedStat>("Save-Time");
 
@@ -38,12 +41,6 @@ public bool AutosaveEnabled
         }
     }
 
-    public GameStateManager(IEnumerable<IGameState> gameStates, IGameStorage storage)
-    {
-        _gameStates = gameStates;
-        _storage = storage;
-    }
-
     public Task InitializeAsync(int columns, int rows)
     {
         Load();

src/Trains.NET.Engine/Nature/Tree.cs

@@ -1,15 +1,10 @@
 namespace Trains.NET.Engine;
 
-public class Tree : IStaticEntity, ISeeded
+public class Tree(int seed) : IStaticEntity, ISeeded
 {
-    public Tree(int seed)
-    {
-        this.Seed = seed;
-    }
-
     public int Column { get; set; }
     public int Row { get; set; }
-    public int Seed { get; }
+    public int Seed { get; } = seed;
 
     public string Identifier => this.Seed.ToString();
 

src/Trains.NET.Engine/Storage/EntityCollectionSerializer.cs

@@ -2,14 +2,9 @@
 
 namespace Trains.NET.Engine.Storage;
 
-public class EntityCollectionSerializer : IEntityCollectionSerializer
+public class EntityCollectionSerializer(IEnumerable<IEntitySerializer> serializer) : IEntityCollectionSerializer
 {
-    private readonly IEnumerable<IEntitySerializer> _serializers;
-
-    public EntityCollectionSerializer(IEnumerable<IEntitySerializer> serializer)
-    {
-        _serializers = serializer;
-    }
+    private readonly IEnumerable<IEntitySerializer> _serializers = serializer;
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>")]
     public IEnumerable<IEntity> Deserialize(string lines)

src/Trains.NET.Engine/Tools/ClearAllCommand.cs

@@ -1,17 +1,12 @@
 namespace Trains.NET.Engine;
 
 [Order(10)]
-public class ClearAllCommand : ICommand
+public class ClearAllCommand(IGameStateManager gameStateManager) : ICommand
 {
-    private readonly IGameStateManager _gameStateManager;
+    private readonly IGameStateManager _gameStateManager = gameStateManager;
 
     public string Name => "Clear All";
 
-    public ClearAllCommand(IGameStateManager gameStateManager)
-    {
-        _gameStateManager = gameStateManager;
-    }
-
     public void Execute()
     {
         _gameStateManager.Reset();

src/Trains.NET.Engine/Tools/EraserTool.cs

@@ -1,22 +1,18 @@
 namespace Trains.NET.Engine;
 
 [Order(20)]
-public class EraserTool : ITool
+public class EraserTool(
+    ILayout trackLayout,
+    IMovableLayout movableLayout,
+    ITrainManager trainManager) : ITool
 {
-    private readonly ILayout _collection;
-    private readonly IMovableLayout _movableLayout;
-    private readonly ITrainManager _trainManager;
+    private readonly ILayout _collection = trackLayout;
+    private readonly IMovableLayout _movableLayout = movableLayout;
+    private readonly ITrainManager _trainManager = trainManager;
 
     public ToolMode Mode => ToolMode.Build;
     public string Name => "Eraser";
 
-    public EraserTool(ILayout trackLayout, IMovableLayout movableLayout, ITrainManager trainManager)
-    {
-        _collection = trackLayout;
-        _movableLayout = movableLayout;
-        _trainManager = trainManager;
-    }
-
     public void Execute(int column, int row, ExecuteInfo info)
     {
         _collection.Remove(column, row);

src/Trains.NET.Engine/Tools/ExecuteInfo.cs

@@ -1,13 +1,7 @@
 namespace Trains.NET.Engine;
 
-public struct ExecuteInfo
+public struct ExecuteInfo(int fromColumn, int fromRow)
 {
-    public readonly int FromColumn;
-    public readonly int FromRow;
-
-    public ExecuteInfo(int fromColumn, int fromRow)
-    {
-        FromColumn = fromColumn;
-        FromRow = fromRow;
-    }
+    public readonly int FromColumn = fromColumn;
+    public readonly int FromRow = fromRow;
 }

src/Trains.NET.Engine/Tools/SaveCommand.cs

@@ -1,17 +1,12 @@
 namespace Trains.NET.Engine;
 
 [Order(150)]
-public class SaveCommand : ICommand
+public class SaveCommand(IGameStateManager gameStateManager) : ICommand
 {
-    private readonly IGameStateManager _gameStateManager;
+    private readonly IGameStateManager _gameStateManager = gameStateManager;
 
     public string Name => "Save";
 
-    public SaveCommand(IGameStateManager gameStateManager)
-    {
-        _gameStateManager = gameStateManager;
-    }
-
     public void Execute()
     {
         _gameStateManager.Save();