Avoid passing around null

Author: marcphilipp

junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java

@@ -30,38 +30,23 @@
 public class ConsoleLauncher {
 
 	public static void main(String... args) {
-		CommandResult<?> result = run(null, null, args);
+		CommandResult<?> result = newCommandFacade().run(args);
 		System.exit(result.getExitCode());
 	}
 
 	@API(status = INTERNAL, since = "1.0")
 	public static CommandResult<?> run(PrintWriter out, PrintWriter err, String... args) {
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(ConsoleTestExecutor::new, out, err);
-		return consoleLauncher.run(args);
-	}
-
-	private final ConsoleTestExecutor.Factory consoleTestExecutorFactory;
-	private final PrintWriter out;
-	private final PrintWriter err;
-
-	ConsoleLauncher(ConsoleTestExecutor.Factory consoleTestExecutorFactory, PrintWriter out, PrintWriter err) {
-		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
-		this.out = out;
-		this.err = err;
-	}
-
-	CommandResult<?> run(String... args) {
 		try {
-			return new CommandFacade(consoleTestExecutorFactory).run(out, err, args);
+			return newCommandFacade().run(args, out, err);
 		}
 		finally {
-			if (out != null) {
-				out.flush();
-			}
-			if (err != null) {
-				err.flush();
-			}
+			out.flush();
+			err.flush();
 		}
 	}
 
+	private static CommandFacade newCommandFacade() {
+		return new CommandFacade(ConsoleTestExecutor::new);
+	}
+
 }

junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java

@@ -33,10 +33,18 @@ public CommandFacade(ConsoleTestExecutor.Factory consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
-	public CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
+	public CommandResult<?> run(String[] args) {
+		return run(args, Optional.empty());
+	}
+
+	public CommandResult<?> run(String[] args, PrintWriter out, PrintWriter err) {
+		return run(args, Optional.of(new OutputConfig(out, err)));
+	}
+
+	private CommandResult<?> run(String[] args, Optional<OutputConfig> outputConfig) {
 		Optional<String> version = ManifestVersionProvider.getImplementationVersion();
 		System.setProperty("junit.docs.version",
 			version.map(it -> it.endsWith("-SNAPSHOT") ? "snapshot" : it).orElse("current"));
-		return new MainCommand(consoleTestExecutorFactory).run(out, err, args);
+		return new MainCommand(consoleTestExecutorFactory).run(args, outputConfig);
 	}
 }

junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java

@@ -103,10 +103,11 @@ private Object runCommand(String subcommand, Optional<String> triggeringOption)
 
 		List<String> args = new ArrayList<>(commandLine.getParseResult().expandedArgs());
 		triggeringOption.ifPresent(args::remove);
-		CommandResult<?> result = runCommand(commandLine.getOut(), //
-			commandLine.getErr(), //
+		CommandResult<?> result = runCommand( //
+			new CommandLine(command), //
 			args.toArray(new String[0]), //
-			command);
+			Optional.of(new OutputConfig(commandLine)) //
+		);
 		this.commandResult = result;
 
 		printDeprecationWarning(subcommand, triggeringOption, commandLine);
@@ -130,27 +131,18 @@ private static void printDeprecationWarning(String subcommand, Optional<String>
 		err.flush();
 	}
 
-	CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
+	CommandResult<?> run(String[] args, Optional<OutputConfig> outputConfig) {
 		CommandLine commandLine = new CommandLine(this) //
 				.addSubcommand(new DiscoverTestsCommand(consoleTestExecutorFactory)) //
 				.addSubcommand(new ExecuteTestsCommand(consoleTestExecutorFactory)) //
 				.addSubcommand(new ListTestEnginesCommand());
-		return runCommand(out, err, args, commandLine);
+		return runCommand(commandLine, args, outputConfig);
 	}
 
-	private static CommandResult<?> runCommand(PrintWriter out, PrintWriter err, String[] args, Object command) {
-		return runCommand(out, err, args, new CommandLine(command));
-	}
-
-	private static CommandResult<Object> runCommand(PrintWriter out, PrintWriter err, String[] args,
-			CommandLine commandLine) {
-		commandLine = BaseCommand.initialize(commandLine);
-		if (out != null) {
-			commandLine = commandLine.setOut(out);
-		}
-		if (err != null) {
-			commandLine = commandLine.setErr(err);
-		}
+	private static CommandResult<Object> runCommand(CommandLine commandLine, String[] args,
+			Optional<OutputConfig> outputConfig) {
+		BaseCommand.initialize(commandLine);
+		outputConfig.ifPresent(it -> it.applyTo(commandLine));
 		int exitCode = commandLine.execute(args);
 		return CommandResult.create(exitCode, getLikelyExecutedCommand(commandLine).getExecutionResult());
 	}

junit-platform-console/src/main/java/org/junit/platform/console/options/OutputConfig.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015-2024 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+import picocli.CommandLine;
+
+class OutputConfig {
+
+	private final PrintWriter out;
+	private final PrintWriter err;
+
+	OutputConfig(CommandLine commandLine) {
+		this(commandLine.getOut(), commandLine.getErr());
+	}
+
+	OutputConfig(PrintWriter out, PrintWriter err) {
+		this.out = out;
+		this.err = err;
+	}
+
+	void applyTo(CommandLine commandLine) {
+		commandLine.setOut(out).setErr(err);
+	}
+}