ConfigInitSteps, made constructor with the same parameters

arturcic · arturcic · commit 07054ed70d9d · 2019-10-25T23:45:03.000+03:00
diff --git a/src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs b/src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs
@@ -15,11 +15,16 @@ internal enum ProjectVisibility
 
     internal class AppVeyorSetup : ConfigInitWizardStep
     {
-        private readonly ProjectVisibility _projectVisibility;
+        private ProjectVisibility _projectVisibility;
 
-        public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, ProjectVisibility visibility) : base(console, fileSystem, log)
+        public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
+        {
+        }
+
+        public AppVeyorSetup WithData(ProjectVisibility visibility)
         {
             _projectVisibility = visibility;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
diff --git a/src/GitVersionCore/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs b/src/GitVersionCore/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
@@ -18,10 +18,10 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     steps.Enqueue(new EditConfigStep(Console, FileSystem, Log));
                     return StepResult.Ok();
                 case "1":
-                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log, ProjectVisibility.Public));
+                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log).WithData(ProjectVisibility.Public));
                     return StepResult.Ok();
                 case "2":
-                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log, ProjectVisibility.Private));
+                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log).WithData(ProjectVisibility.Private));
                     return StepResult.Ok();
             }
             return StepResult.Ok();
diff --git a/src/GitVersionCore/Configuration/Init/EditConfigStep.cs b/src/GitVersionCore/Configuration/Init/EditConfigStep.cs
@@ -33,7 +33,8 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     steps.Enqueue(new ConfigureBranches(Console, FileSystem, Log));
                     return StepResult.Ok();
                 case "5":
-                    steps.Enqueue(new GlobalModeSetting(new EditConfigStep(Console, FileSystem, Log), false, Console, FileSystem, Log));
+                    var editConfigStep = new EditConfigStep(Console, FileSystem, Log);
+                    steps.Enqueue(new GlobalModeSetting(Console, FileSystem, Log).WithData(editConfigStep, false));
                     return StepResult.Ok();
                 case "6":
                     steps.Enqueue(new AssemblyVersioningSchemeSetting(Console, FileSystem, Log));
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs b/src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs
@@ -6,14 +6,18 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class ConfigureBranch : ConfigInitWizardStep
     {
-        private readonly string name;
-        private readonly BranchConfig branchConfig;
+        private string name;
+        private BranchConfig branchConfig;
 
-        public ConfigureBranch(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log) 
-            : base(console, fileSystem, log)
+        public ConfigureBranch(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.branchConfig = branchConfig;
-            this.name = name;
+        }
+
+        public ConfigureBranch WithData(string _name, BranchConfig _branchConfig)
+        {
+            branchConfig = _branchConfig;
+            name = _name;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
@@ -24,10 +28,10 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     steps.Enqueue(new ConfigureBranches(Console, FileSystem, Log));
                     return StepResult.Ok();
                 case "1":
-                    steps.Enqueue(new SetBranchTag(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new SetBranchTag(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 case "2":
-                    steps.Enqueue(new SetBranchIncrementMode(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new SetBranchIncrementMode(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
             }
 
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranches.cs b/src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranches.cs
@@ -31,7 +31,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                         branchConfig = new BranchConfig {Name = foundBranch.Key};
                         config.Branches.Add(foundBranch.Key, branchConfig);
                     }
-                    steps.Enqueue(new ConfigureBranch(foundBranch.Key, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(foundBranch.Key, branchConfig));
                     return StepResult.Ok();
                 }
                 catch (ArgumentOutOfRangeException)
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/GlobalModeSetting.cs b/src/GitVersionCore/Configuration/Init/SetConfig/GlobalModeSetting.cs
@@ -7,14 +7,18 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class GlobalModeSetting : ConfigInitWizardStep
     {
-        private readonly ConfigInitWizardStep returnToStep;
-        private readonly bool isPartOfWizard;
+        private ConfigInitWizardStep returnToStep;
+        private bool isPartOfWizard;
 
-        public GlobalModeSetting(ConfigInitWizardStep returnToStep, bool isPartOfWizard, IConsole console, IFileSystem fileSystem, ILog log)
-            : base(console, fileSystem, log)
+        public GlobalModeSetting(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.returnToStep = returnToStep;
-            this.isPartOfWizard = isPartOfWizard;
+        }
+
+        public GlobalModeSetting WithData(ConfigInitWizardStep _returnToStep, bool _isPartOfWizard)
+        {
+            returnToStep = _returnToStep;
+            isPartOfWizard = _isPartOfWizard;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/SetBranchIncrementMode.cs b/src/GitVersionCore/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
@@ -7,30 +7,34 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class SetBranchIncrementMode : ConfigInitWizardStep
     {
-        private readonly string name;
-        private readonly BranchConfig branchConfig;
+        private string name;
+        private BranchConfig branchConfig;
 
-        public SetBranchIncrementMode(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log)
-            : base(console, fileSystem, log)
+        public SetBranchIncrementMode(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.name = name;
-            this.branchConfig = branchConfig;
+        }
+
+        public SetBranchIncrementMode WithData(string _name, BranchConfig _branchConfig)
+        {
+            branchConfig = _branchConfig;
+            name = _name;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
         {
             switch (result)
             {
                 case "0":
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 case "1":
                     branchConfig.VersioningMode = VersioningMode.ContinuousDelivery;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 case "2":
                     branchConfig.VersioningMode = VersioningMode.ContinuousDeployment;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
             }
 
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs b/src/GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs
@@ -6,14 +6,18 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class SetBranchTag : ConfigInitWizardStep
     {
-        private readonly string name;
-        private readonly BranchConfig branchConfig;
+        private string name;
+        private BranchConfig branchConfig;
 
-        public SetBranchTag(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log)
-            : base(console, fileSystem, log)
+        public SetBranchTag(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.name = name;
-            this.branchConfig = branchConfig;
+        }
+
+        public SetBranchTag WithData(string _name, BranchConfig _branchConfig)
+        {
+            branchConfig = _branchConfig;
+            name = _name;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
@@ -26,15 +30,15 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
             switch (result)
             {
                 case "0":
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData( name, branchConfig));
                     return StepResult.Ok();
                 case "1":
                     branchConfig.Tag = string.Empty;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 default:
                     branchConfig.Tag = result;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
             }
         }
diff --git a/src/GitVersionCore/Configuration/Init/Wizard/GitFlowSetupStep.cs b/src/GitVersionCore/Configuration/Init/Wizard/GitFlowSetupStep.cs
@@ -5,7 +5,7 @@ namespace GitVersion.Configuration.Init.Wizard
 {
     public class GitFlowSetupStep : GlobalModeSetting
     {
-        public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log) : base(new FinishedSetupStep(console, fileSystem, log), true, console, fileSystem, log)
+        public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
         }
 
diff --git a/src/GitVersionCore/Configuration/Init/Wizard/GitHubFlowStep.cs b/src/GitVersionCore/Configuration/Init/Wizard/GitHubFlowStep.cs
@@ -5,7 +5,7 @@ namespace GitVersion.Configuration.Init.Wizard
 {
     public class GitHubFlowStep : GlobalModeSetting
     {
-        public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log) : base(new FinishedSetupStep(console, fileSystem, log), true, console, fileSystem, log)
+        public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
         }
 
diff --git a/src/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategyStep.cs b/src/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
@@ -11,13 +11,14 @@ public PickBranchingStrategyStep(IConsole console, IFileSystem fileSystem, ILog
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
         {
+            var returnToStep = new FinishedSetupStep(Console, FileSystem, Log);
             switch (result)
             {
                 case "1":
-                    steps.Enqueue(new GitFlowSetupStep(Console, FileSystem, Log));
+                    steps.Enqueue(new GitFlowSetupStep(Console, FileSystem, Log).WithData(returnToStep, true));
                     break;
                 case "2":
-                    steps.Enqueue(new GitHubFlowStep(Console, FileSystem, Log));
+                    steps.Enqueue(new GitHubFlowStep(Console, FileSystem, Log).WithData(returnToStep, true));
                     break;
                 case "3":
                     steps.Enqueue(new PickBranchingStrategy1Step(Console, FileSystem, Log));

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,16 @@ internal enum ProjectVisibility`
`15`	`15`
`16`	`16`	`internal class AppVeyorSetup : ConfigInitWizardStep`
`17`	`17`	`{`
`18`		`- private readonly ProjectVisibility _projectVisibility;`
	`18`	`+ private ProjectVisibility _projectVisibility;`
`19`	`19`
`20`		`- public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, ProjectVisibility visibility) : base(console, fileSystem, log)`
	`20`	`+ public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)`
	`21`	`+ {`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ public AppVeyorSetup WithData(ProjectVisibility visibility)`
`21`	`25`	`{`
`22`	`26`	`_projectVisibility = visibility;`
	`27`	`+ return this;`
`23`	`28`	`}`
`24`	`29`
`25`	`30`	`protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard`
`31`	`31`	`branchConfig = new BranchConfig {Name = foundBranch.Key};`
`32`	`32`	`config.Branches.Add(foundBranch.Key, branchConfig);`
`33`	`33`	`}`
`34`		`- steps.Enqueue(new ConfigureBranch(foundBranch.Key, branchConfig, Console, FileSystem, Log));`
	`34`	`+ steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(foundBranch.Key, branchConfig));`
`35`	`35`	`return StepResult.Ok();`
`36`	`36`	`}`
`37`	`37`	`catch (ArgumentOutOfRangeException)`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,18 @@ namespace GitVersion.Configuration.Init.SetConfig`
`7`	`7`	`{`
`8`	`8`	`public class GlobalModeSetting : ConfigInitWizardStep`
`9`	`9`	`{`
`10`		`- private readonly ConfigInitWizardStep returnToStep;`
`11`		`- private readonly bool isPartOfWizard;`
	`10`	`+ private ConfigInitWizardStep returnToStep;`
	`11`	`+ private bool isPartOfWizard;`
`12`	`12`
`13`		`- public GlobalModeSetting(ConfigInitWizardStep returnToStep, bool isPartOfWizard, IConsole console, IFileSystem fileSystem, ILog log)`
`14`		`- : base(console, fileSystem, log)`
	`13`	`+ public GlobalModeSetting(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)`
`15`	`14`	`{`
`16`		`- this.returnToStep = returnToStep;`
`17`		`- this.isPartOfWizard = isPartOfWizard;`
	`15`	`+ }`
	`16`	`+`
	`17`	`+ public GlobalModeSetting WithData(ConfigInitWizardStep _returnToStep, bool _isPartOfWizard)`
	`18`	`+ {`
	`19`	`+ returnToStep = _returnToStep;`
	`20`	`+ isPartOfWizard = _isPartOfWizard;`
	`21`	`+ return this;`
`18`	`22`	`}`
`19`	`23`
`20`	`24`	`protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace GitVersion.Configuration.Init.Wizard`
`5`	`5`	`{`
`6`	`6`	`public class GitFlowSetupStep : GlobalModeSetting`
`7`	`7`	`{`
`8`		`- public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log) : base(new FinishedSetupStep(console, fileSystem, log), true, console, fileSystem, log)`
	`8`	`+ public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace GitVersion.Configuration.Init.Wizard`
`5`	`5`	`{`
`6`	`6`	`public class GitHubFlowStep : GlobalModeSetting`
`7`	`7`	`{`
`8`		`- public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log) : base(new FinishedSetupStep(console, fileSystem, log), true, console, fileSystem, log)`
	`8`	`+ public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`