Implement code review notes and move all readonly field to the beginning of the class definition.

Author: HHobeck

src/GitVersion.Core/Core/TaggedSemanticVersionRepository.cs

@@ -7,6 +7,12 @@ namespace GitVersion.Core;
 
 internal sealed class TaggedSemanticVersionRepository : ITaggedSemanticVersionRepository
 {
+    private readonly ConcurrentDictionary<(IBranch, string, SemanticVersionFormat), ILookup<ICommit, SemanticVersionWithTag>>
+        taggedSemanticVersionsOfBranchCache = new();
+    private readonly ConcurrentDictionary<(IBranch, string, SemanticVersionFormat), ILookup<ICommit, SemanticVersionWithTag>>
+        taggedSemanticVersionsOfMergeTargetCache = new();
+    private readonly ConcurrentDictionary<(string, SemanticVersionFormat), ILookup<ICommit, SemanticVersionWithTag>>
+        taggedSemanticVersionsCache = new();
     private readonly ILog log;
 
     private GitVersionContext VersionContext => this.versionContextLazy.Value;
@@ -105,9 +111,6 @@ public ILookup<ICommit, SemanticVersionWithTag> GetAllTaggedSemanticVersions(IBr
         return GetElements().Distinct().ToLookup(element => element.Key, element => element.Value);
     }
 
-    private readonly ConcurrentDictionary<(IBranch, string, SemanticVersionFormat), ILookup<ICommit, SemanticVersionWithTag>>
-        taggedSemanticVersionsOfBranchCache = new();
-
     public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfBranch(
         IBranch branch, string? tagPrefix, SemanticVersionFormat format)
     {
@@ -148,9 +151,6 @@ IEnumerable<SemanticVersionWithTag> GetElements()
         return result;
     }
 
-    private readonly ConcurrentDictionary<(IBranch, string, SemanticVersionFormat), ILookup<ICommit, SemanticVersionWithTag>>
-        taggedSemanticVersionsOfMergeTargetCache = new();
-
     public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMergeTarget(
         IBranch branch, string? tagPrefix, SemanticVersionFormat format)
     {
@@ -240,9 +240,6 @@ IEnumerable<SemanticVersionWithTag> GetElements()
         return GetElements().Distinct().ToLookup(element => element.Tag.Commit, element => element);
     }
 
-    private readonly ConcurrentDictionary<(string, SemanticVersionFormat), ILookup<ICommit, SemanticVersionWithTag>>
-        taggedSemanticVersionsCache = new();
-
     private ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersions(string? tagPrefix, SemanticVersionFormat format)
     {
         tagPrefix ??= string.Empty;

src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs

@@ -11,21 +11,61 @@ namespace GitVersion.VersionCalculation;
 
 internal sealed class TrunkBasedVersionStrategy : VersionStrategyBase
 {
-    private volatile int IterationCounter;
+    private static readonly IReadOnlyCollection<ITrunkBasedContextPreEnricher> TrunkContextPreEnricherCollection = new ITrunkBasedContextPreEnricher[]
+    {
+        new EnrichSemanticVersion(),
+        new EnrichIncrement()
+    };
+    private static readonly IReadOnlyCollection<ITrunkBasedContextPostEnricher> TrunkContextPostEnricherCollection = new ITrunkBasedContextPostEnricher[]
+    {
+        new RemoveSemanticVersion(),
+        new RemoveIncrement()
+    };
+    private static readonly IReadOnlyCollection<ITrunkBasedIncrementer> TrunkIncrementerCollection = new ITrunkBasedIncrementer[]
+    {
+        // Trunk
+        new CommitOnTrunk(),
 
-    private ITaggedSemanticVersionRepository TaggedSemanticVersionRepository { get; }
+        new CommitOnTrunkWithPreReleaseTag(),
+        new LastCommitOnTrunkWithPreReleaseTag(),
 
-    private IRepositoryStore RepositoryStore { get; }
+        new CommitOnTrunkWithStableTag(),
+        new LastCommitOnTrunkWithStableTag(),
 
-    private IIncrementStrategyFinder IncrementStrategyFinder { get; }
+        new MergeCommitOnTrunk(),
+        new LastMergeCommitOnTrunk(),
+
+        new CommitOnTrunkBranchedToTrunk(),
+        new CommitOnTrunkBranchedToNonTrunk(),
+
+        // NonTrunk
+        new CommitOnNonTrunk(),
+        new CommitOnNonTrunkWithPreReleaseTag(),
+        new LastCommitOnNonTrunkWithPreReleaseTag(),
+
+        new CommitOnNonTrunkWithStableTag(),
+        new LastCommitOnNonTrunkWithStableTag(),
+
+        new MergeCommitOnNonTrunk(),
+        new LastMergeCommitOnNonTrunk(),
+
+        new CommitOnNonTrunkBranchedToTrunk(),
+        new CommitOnNonTrunkBranchedToNonTrunk()
+    };
+
+    private volatile int iterationCounter;
+
+    private readonly ITaggedSemanticVersionRepository taggedSemanticVersionRepository;
+    private readonly IRepositoryStore repositoryStore;
+    private readonly IIncrementStrategyFinder incrementStrategyFinder;
 
     public TrunkBasedVersionStrategy(Lazy<GitVersionContext> context, IRepositoryStore repositoryStore,
         ITaggedSemanticVersionRepository taggedSemanticVersionRepository, IIncrementStrategyFinder incrementStrategyFinder
     ) : base(context)
     {
-        RepositoryStore = repositoryStore.NotNull();
-        TaggedSemanticVersionRepository = taggedSemanticVersionRepository.NotNull();
-        IncrementStrategyFinder = incrementStrategyFinder.NotNull();
+        this.repositoryStore = repositoryStore.NotNull();
+        this.taggedSemanticVersionRepository = taggedSemanticVersionRepository.NotNull();
+        this.incrementStrategyFinder = incrementStrategyFinder.NotNull();
     }
 
     public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfiguration configuration)
@@ -34,7 +74,7 @@ public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfigur
 
         var iteration = CreateIteration(branchName: Context.CurrentBranch.Name, configuration: configuration.Value);
 
-        var taggedSemanticVersions = TaggedSemanticVersionRepository.GetAllTaggedSemanticVersions(
+        var taggedSemanticVersions = taggedSemanticVersionRepository.GetAllTaggedSemanticVersions(
             Context.CurrentBranch, configuration.Value
         );
 
@@ -52,7 +92,7 @@ public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfigur
     private TrunkBasedIteration CreateIteration(
         ReferenceName branchName, EffectiveConfiguration configuration, TrunkBasedIteration? parent = null)
     {
-        var iterationCount = Interlocked.Increment(ref IterationCounter);
+        var iterationCount = Interlocked.Increment(ref iterationCounter);
         return new TrunkBasedIteration(
             id: $"#{iterationCount}",
             branchName: branchName,
@@ -83,7 +123,7 @@ private bool IterateOverCommitsRecursive(
             {
                 configuration = effectiveConfigurationWasBranchedFrom.Value;
                 branchName = effectiveConfigurationWasBranchedFrom.Branch.Name;
-                taggedSemanticVersions = TaggedSemanticVersionRepository.GetAllTaggedSemanticVersions(
+                taggedSemanticVersions = taggedSemanticVersionRepository.GetAllTaggedSemanticVersions(
                     effectiveConfigurationWasBranchedFrom.Branch, effectiveConfigurationWasBranchedFrom.Value
                 );
             }
@@ -103,7 +143,7 @@ private bool IterateOverCommitsRecursive(
             if (item.IsMergeCommit)
             {
                 Lazy<IReadOnlyCollection<ICommit>> mergedCommitsInReverseOrderLazy = new(
-                    () => IncrementStrategyFinder.GetMergedCommits(item, 1).Reverse().ToList()
+                    () => incrementStrategyFinder.GetMergedCommits(item, 1).Reverse().ToList()
                 );
 
                 if (configuration.TrackMergeMessage
@@ -125,7 +165,7 @@ private bool IterateOverCommitsRecursive(
                         {
                             if (configuration.IsMainline) throw new NotImplementedException();
                             mergedCommitsInReverseOrderLazy = new(
-                                () => IncrementStrategyFinder.GetMergedCommits(item, 0).Reverse().ToList()
+                                () => incrementStrategyFinder.GetMergedCommits(item, 0).Reverse().ToList()
                             );
                             childConfiguration = configuration;
                         }
@@ -162,10 +202,10 @@ private VersionField GetIncrementForcedByCommit(ICommit commit, EffectiveConfigu
 
         return configuration.CommitMessageIncrementing switch
         {
-            CommitMessageIncrementMode.Enabled => IncrementStrategyFinder.GetIncrementForcedByCommit(commit, configuration),
+            CommitMessageIncrementMode.Enabled => incrementStrategyFinder.GetIncrementForcedByCommit(commit, configuration),
             CommitMessageIncrementMode.Disabled => VersionField.None,
             CommitMessageIncrementMode.MergeMessageOnly => commit.IsMergeCommit
-                ? IncrementStrategyFinder.GetIncrementForcedByCommit(commit, configuration) : VersionField.None,
+                ? incrementStrategyFinder.GetIncrementForcedByCommit(commit, configuration) : VersionField.None,
             _ => throw new InvalidEnumArgumentException(
                 nameof(configuration.CommitMessageIncrementing), (int)configuration.CommitMessageIncrementing, typeof(CommitMessageIncrementMode)
             )
@@ -176,10 +216,10 @@ private IReadOnlyDictionary<ICommit, EffectiveBranchConfiguration> GetCommitsWas
     {
         Dictionary<ICommit, EffectiveBranchConfiguration> result = new();
 
-        var branch = RepositoryStore.FindBranch(branchName);
+        var branch = repositoryStore.FindBranch(branchName);
         if (branch is null) return result;
 
-        var branchCommits = RepositoryStore.FindCommitBranchesWasBranchedFrom(
+        var branchCommits = repositoryStore.FindCommitBranchesWasBranchedFrom(
             branch, Context.Configuration
         ).ToList();
 
@@ -290,46 +330,4 @@ private static IEnumerable<BaseVersionV2> GetIncrementSteps(TrunkBasedIteration
             }
         }
     }
-
-    private static readonly IReadOnlyCollection<ITrunkBasedContextPreEnricher> TrunkContextPreEnricherCollection = new ITrunkBasedContextPreEnricher[]
-    {
-        new EnrichSemanticVersion(),
-        new EnrichIncrement()
-    };
-    private static readonly IReadOnlyCollection<ITrunkBasedContextPostEnricher> TrunkContextPostEnricherCollection = new ITrunkBasedContextPostEnricher[]
-    {
-        new RemoveSemanticVersion(),
-        new RemoveIncrement()
-    };
-    private static readonly IReadOnlyCollection<ITrunkBasedIncrementer> TrunkIncrementerCollection = new ITrunkBasedIncrementer[]
-    {
-        // Trunk
-        new CommitOnTrunk(),
-
-        new CommitOnTrunkWithPreReleaseTag(),
-        new LastCommitOnTrunkWithPreReleaseTag(),
-
-        new CommitOnTrunkWithStableTag(),
-        new LastCommitOnTrunkWithStableTag(),
-
-        new MergeCommitOnTrunk(),
-        new LastMergeCommitOnTrunk(),
-
-        new CommitOnTrunkBranchedToTrunk(),
-        new CommitOnTrunkBranchedToNonTrunk(),
-
-        // NonTrunk
-        new CommitOnNonTrunk(),
-        new CommitOnNonTrunkWithPreReleaseTag(),
-        new LastCommitOnNonTrunkWithPreReleaseTag(),
-
-        new CommitOnNonTrunkWithStableTag(),
-        new LastCommitOnNonTrunkWithStableTag(),
-
-        new MergeCommitOnNonTrunk(),
-        new LastMergeCommitOnNonTrunk(),
-
-        new CommitOnNonTrunkBranchedToTrunk(),
-        new CommitOnNonTrunkBranchedToNonTrunk()
-    };
 }