inject parser into constructor rather than method

Brightspace · Jun 29, 2023 · aa525c6 · aa525c6
1 parent f0cd054
commit aa525c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/D2L.Bmx/BmxConfigProvider.cs b/src/D2L.Bmx/BmxConfigProvider.cs
@@ -8,10 +8,10 @@ namespace D2L.Bmx;
 
 internal interface IBmxConfigProvider {
 	BmxConfig GetConfiguration();
-	void SaveConfiguration( BmxConfig config, FileIniDataParser parser );
+	void SaveConfiguration( BmxConfig config );
 }
 
-internal class BmxConfigProvider : IBmxConfigProvider {
+internal class BmxConfigProvider( FileIniDataParser parser ) : IBmxConfigProvider {
 	public BmxConfig GetConfiguration() {
 		// Main config is at ~/.bmx/config
 		string configFileName = BmxPaths.CONFIG_FILE_NAME;
@@ -49,7 +49,7 @@ public BmxConfig GetConfiguration() {
 		);
 	}
 
-	public void SaveConfiguration( BmxConfig config, FileIniDataParser parser ) {
+	public void SaveConfiguration( BmxConfig config ) {
 		if( !Directory.Exists( BmxPaths.BMX_DIR ) ) {
 			Directory.CreateDirectory( BmxPaths.BMX_DIR );
 		}

diff --git a/src/D2L.Bmx/ConfigureHandler.cs b/src/D2L.Bmx/ConfigureHandler.cs
@@ -1,11 +1,9 @@
-using IniParser;
 
 namespace D2L.Bmx;
 
 internal class ConfigureHandler(
 	IBmxConfigProvider configProvider,
-	IConsolePrompter consolePrompter,
-	FileIniDataParser parser
+	IConsolePrompter consolePrompter
 ) {
 	public void Handle(
 		string? org,
@@ -34,7 +32,7 @@ bool nonInteractive
 			Profile: null,
 			Duration: duration
 		);
-		configProvider.SaveConfiguration( config, parser );
+		configProvider.SaveConfiguration( config );
 		Console.WriteLine( "Your configuration has been created. Okta sessions will now also be cached." );
 	}
 }
diff --git a/src/D2L.Bmx/Program.cs b/src/D2L.Bmx/Program.cs
@@ -39,9 +39,8 @@
 
 configureCommand.SetHandler( ( InvocationContext context ) => RunWithErrorHandlingAsync( context, () => {
 	var handler = new ConfigureHandler(
-		new BmxConfigProvider(),
-		new ConsolePrompter(),
-		new FileIniDataParser() );
+		new BmxConfigProvider( new FileIniDataParser() ),
+		new ConsolePrompter() );
 	handler.Handle(
 		org: context.ParseResult.GetValueForOption( orgOption ),
 		user: context.ParseResult.GetValueForOption( userOption ),
@@ -88,7 +87,7 @@
 
 printCommand.SetHandler( ( InvocationContext context ) => RunWithErrorHandlingAsync( context, () => {
 	var consolePrompter = new ConsolePrompter();
-	var config = new BmxConfigProvider().GetConfiguration();
+	var config = new BmxConfigProvider( new FileIniDataParser() ).GetConfiguration();
 	var handler = new PrintHandler(
 		new OktaAuthenticator(
 			new OktaApi(),
@@ -134,7 +133,7 @@
 
 writeCommand.SetHandler( ( InvocationContext context ) => RunWithErrorHandlingAsync( context, () => {
 	var consolePrompter = new ConsolePrompter();
-	var config = new BmxConfigProvider().GetConfiguration();
+	var config = new BmxConfigProvider( new FileIniDataParser() ).GetConfiguration();
 	var handler = new WriteHandler(
 		new OktaAuthenticator(
 			new OktaApi(),
@@ -170,7 +169,7 @@
 
 loginCommand.SetHandler( ( InvocationContext context ) => RunWithErrorHandlingAsync( context, () => {
 	var consolePrompter = new ConsolePrompter();
-	var config = new BmxConfigProvider().GetConfiguration();
+	var config = new BmxConfigProvider( new FileIniDataParser() ).GetConfiguration();
 	var handler = new LoginHandler(
 		new OktaAuthenticator(
 			new OktaApi(),