Restructure ConsoleLauncher to avoid package cycles (#4926)

All of these packages are considered internal so no deprecation cycle is
needed.

Author: marcphilipp

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

@@ -16,10 +16,10 @@
 import java.io.PrintWriter;
 
 import org.apiguardian.api.API;
-import org.junit.platform.console.options.CommandFacade;
-import org.junit.platform.console.options.CommandResult;
-import org.junit.platform.console.tasks.ConsoleTestExecutor;
-import org.junit.platform.console.tasks.CustomClassLoaderCloseStrategy;
+import org.junit.platform.console.command.CommandFacade;
+import org.junit.platform.console.command.CommandResult;
+import org.junit.platform.console.command.ConsoleTestExecutor;
+import org.junit.platform.console.command.CustomClassLoaderCloseStrategy;
 
 /**
  * The {@code ConsoleLauncher} is a stand-alone application for launching the

junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/BaseCommand.java

@@ -8,12 +8,13 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.options;
+package org.junit.platform.console.command;
 
 import java.io.PrintWriter;
 import java.util.concurrent.Callable;
 
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.console.options.AnsiColorOptionMixin;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Mixin;

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

@@ -8,15 +8,14 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.options;
+package org.junit.platform.console.command;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.io.PrintWriter;
 import java.util.Optional;
 
 import org.apiguardian.api.API;
-import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 /**
  * Internal facade to run a CLI command that exists to hide implementation

junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/CommandResult.java

@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.options;
+package org.junit.platform.console.command;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 

junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/ConsoleTestExecutor.java

@@ -8,11 +8,11 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.tasks;
+package org.junit.platform.console.command;
 
 import static java.util.Objects.requireNonNullElseGet;
 import static org.apiguardian.api.API.Status.INTERNAL;
-import static org.junit.platform.console.tasks.DiscoveryRequestCreator.toDiscoveryRequestBuilder;
+import static org.junit.platform.console.command.DiscoveryRequestCreator.toDiscoveryRequestBuilder;
 import static org.junit.platform.launcher.LauncherConstants.OUTPUT_DIR_PROPERTY_NAME;
 
 import java.io.PrintStream;
@@ -32,7 +32,13 @@
 import org.junit.platform.console.options.Details;
 import org.junit.platform.console.options.TestConsoleOutputOptions;
 import org.junit.platform.console.options.TestDiscoveryOptions;
-import org.junit.platform.console.options.Theme;
+import org.junit.platform.console.output.ColorPalette;
+import org.junit.platform.console.output.DetailsPrintingListener;
+import org.junit.platform.console.output.FlatPrintingListener;
+import org.junit.platform.console.output.TestFeedPrintingListener;
+import org.junit.platform.console.output.Theme;
+import org.junit.platform.console.output.TreePrintingListener;
+import org.junit.platform.console.output.VerboseTreePrintingListener;
 import org.junit.platform.engine.CancellationToken;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;

junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomClassLoaderCloseStrategy.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/CustomClassLoaderCloseStrategy.java

@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.tasks;
+package org.junit.platform.console.command;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 

junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/CustomContextClassLoaderExecutor.java

@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.tasks;
+package org.junit.platform.console.command;
 
 import java.util.Optional;
 import java.util.function.Supplier;

junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/DiscoverTestsCommand.java

@@ -8,11 +8,14 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.options;
+package org.junit.platform.console.command;
 
 import java.io.PrintWriter;
 
-import org.junit.platform.console.tasks.ConsoleTestExecutor;
+import org.junit.platform.console.options.TestConsoleOutputOptions;
+import org.junit.platform.console.options.TestConsoleOutputOptionsMixin;
+import org.junit.platform.console.options.TestDiscoveryOptions;
+import org.junit.platform.console.options.TestDiscoveryOptionsMixin;
 
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;

junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/DiscoveryRequestCreator.java

@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.tasks;
+package org.junit.platform.console.command;
 
 import static org.junit.platform.engine.discovery.ClassNameFilter.excludeClassNamePatterns;
 import static org.junit.platform.engine.discovery.ClassNameFilter.includeClassNamePatterns;

junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java renamed to junit-platform-console/src/main/java/org/junit/platform/console/command/ExecuteTestsCommand.java

@@ -8,16 +8,19 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console.options;
+package org.junit.platform.console.command;
 
-import static org.junit.platform.console.options.CommandResult.SUCCESS;
+import static org.junit.platform.console.command.CommandResult.SUCCESS;
 
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.Optional;
 
 import org.jspecify.annotations.Nullable;
-import org.junit.platform.console.tasks.ConsoleTestExecutor;
+import org.junit.platform.console.options.TestConsoleOutputOptions;
+import org.junit.platform.console.options.TestConsoleOutputOptionsMixin;
+import org.junit.platform.console.options.TestDiscoveryOptions;
+import org.junit.platform.console.options.TestDiscoveryOptionsMixin;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 import picocli.CommandLine;