diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java b/devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java index a4e491f3fc1ad8..2e272c4ba58878 100644 --- a/devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java +++ b/devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java @@ -12,7 +12,7 @@ import org.aesh.command.validator.CommandValidatorException; import org.aesh.command.validator.OptionValidatorException; -import io.quarkus.cli.commands.QuarkusCommandHandler; +import io.quarkus.devtools.commands.handlers.QuarkusCommandHandler; public class QuarkusCli { diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/AddExtensionCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/AddExtensionCommand.java index b877068cc47a1c..d9594101ba9b74 100644 --- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/AddExtensionCommand.java +++ b/devtools/aesh/src/main/java/io/quarkus/cli/commands/AddExtensionCommand.java @@ -5,7 +5,8 @@ import java.util.Collections; import java.util.List; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.AddExtensions; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import org.aesh.command.Command; import org.aesh.command.CommandDefinition; import org.aesh.command.CommandException; diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/CreateProjectCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/CreateProjectCommand.java index 68596a7b528cf2..e639f7ca074954 100644 --- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/CreateProjectCommand.java +++ b/devtools/aesh/src/main/java/io/quarkus/cli/commands/CreateProjectCommand.java @@ -4,6 +4,7 @@ import java.nio.file.Paths; import java.util.HashMap; +import io.quarkus.devtools.commands.CreateProject; import org.aesh.command.Command; import org.aesh.command.CommandDefinition; import org.aesh.command.CommandResult; diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ListExtensionsCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/ListExtensionsCommand.java index 380c4f6d04a950..98069512e6715f 100644 --- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ListExtensionsCommand.java +++ b/devtools/aesh/src/main/java/io/quarkus/cli/commands/ListExtensionsCommand.java @@ -2,6 +2,7 @@ import java.nio.file.Paths; +import io.quarkus.devtools.commands.ListExtensions; import org.aesh.command.Command; import org.aesh.command.CommandDefinition; import org.aesh.command.CommandException; diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/QuarkusCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/QuarkusCommand.java index 280d3559f069de..dc9b15e63fd2ef 100644 --- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/QuarkusCommand.java +++ b/devtools/aesh/src/main/java/io/quarkus/cli/commands/QuarkusCommand.java @@ -1,5 +1,6 @@ package io.quarkus.cli.commands; +import io.quarkus.devtools.commands.handlers.QuarkusCommandHandler; import org.aesh.command.Command; import org.aesh.command.CommandException; import org.aesh.command.CommandResult; diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/RemoveExtensionCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/RemoveExtensionCommand.java index 943af1b480b2c8..71e109a00feaeb 100644 --- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/RemoveExtensionCommand.java +++ b/devtools/aesh/src/main/java/io/quarkus/cli/commands/RemoveExtensionCommand.java @@ -5,7 +5,8 @@ import java.util.Collections; import java.util.List; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.RemoveExtensions; import org.aesh.command.Command; import org.aesh.command.CommandDefinition; import org.aesh.command.CommandException; diff --git a/devtools/gradle/src/functionalTest/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java b/devtools/gradle/src/functionalTest/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java index c1c0248b223d8c..63026d1af3a88f 100644 --- a/devtools/gradle/src/functionalTest/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java +++ b/devtools/gradle/src/functionalTest/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; -import io.quarkus.cli.commands.CreateProject; +import io.quarkus.devtools.commands.CreateProject; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.codegen.SourceType; import io.quarkus.platform.tools.config.QuarkusPlatformConfig; diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/GradleBuildFileFromConnector.java b/devtools/gradle/src/main/java/io/quarkus/gradle/GradleBuildFileFromConnector.java index 3a2e41a15eae63..2cb675e18cd833 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/GradleBuildFileFromConnector.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/GradleBuildFileFromConnector.java @@ -14,7 +14,7 @@ import org.gradle.tooling.model.eclipse.EclipseExternalDependency; import org.gradle.tooling.model.eclipse.EclipseProject; -import io.quarkus.devtools.buildfile.AbstractGradleBuildFile; +import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; public class GradleBuildFileFromConnector extends AbstractGradleBuildFile { diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java index d640818576b84d..7037b775355dab 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java @@ -11,7 +11,7 @@ import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.options.Option; -import io.quarkus.cli.commands.AddExtensions; +import io.quarkus.devtools.commands.AddExtensions; public class QuarkusAddExtension extends QuarkusPlatformTask { diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java index 35bb017c74dc18..aad55911e3c299 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java @@ -6,7 +6,7 @@ import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.options.Option; -import io.quarkus.cli.commands.ListExtensions; +import io.quarkus.devtools.commands.ListExtensions; public class QuarkusListExtensions extends QuarkusPlatformTask { diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java index 467acad3a3872c..e422cb2593ebc2 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java @@ -11,7 +11,7 @@ import org.gradle.api.tasks.Internal; import io.quarkus.devtools.project.QuarkusProject; -import io.quarkus.devtools.buildfile.BuildFile; +import io.quarkus.devtools.project.buildfile.BuildFile; import io.quarkus.gradle.GradleBuildFileFromConnector; import io.quarkus.platform.descriptor.CombinedQuarkusPlatformDescriptor; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java index 482ed669a8cbc6..1adf369f5c4154 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java @@ -11,7 +11,7 @@ import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.options.Option; -import io.quarkus.cli.commands.RemoveExtensions; +import io.quarkus.devtools.commands.RemoveExtensions; public class QuarkusRemoveExtension extends QuarkusPlatformTask { diff --git a/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java index 411eae8d27eb12..4442aa26a4cfb7 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java @@ -10,8 +10,8 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import io.quarkus.cli.commands.AddExtensions; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.AddExtensions; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.platform.tools.MessageWriter; diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java index 9749d058286ce5..fa68d67e6f3f94 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java @@ -46,7 +46,7 @@ import io.quarkus.bootstrap.resolver.AppModelResolverException; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.cli.commands.CreateProject; +import io.quarkus.devtools.commands.CreateProject; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.codegen.SourceType; import io.quarkus.maven.components.MavenVersionEnforcer; diff --git a/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java index 6de18e4f6c021e..91ae34967b52d6 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java @@ -4,7 +4,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import io.quarkus.cli.commands.ListExtensions; +import io.quarkus.devtools.commands.ListExtensions; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.platform.tools.MessageWriter; diff --git a/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java index 4caa81b4a89a3f..165c951bc4cd66 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java @@ -10,8 +10,8 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import io.quarkus.cli.commands.RemoveExtensions; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.RemoveExtensions; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.platform.tools.MessageWriter; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/QuarkusCommandHandler.java b/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/QuarkusCommandHandler.java deleted file mode 100644 index 8f8279be0aa74c..00000000000000 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/QuarkusCommandHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.quarkus.cli.commands; - -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; - -public interface QuarkusCommandHandler { - - QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws QuarkusCommandException; -} diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/AddExtensions.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java similarity index 83% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/AddExtensions.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java index 914de39f67963a..c959edadc6c40a 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/AddExtensions.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java @@ -1,10 +1,11 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static com.google.common.base.Preconditions.checkNotNull; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.handlers.AddExtensionsCommandHandler; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.extensions.ExtensionsManager; import io.quarkus.platform.tools.ToolsConstants; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/CreateProject.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/CreateProject.java similarity index 94% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/CreateProject.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/CreateProject.java index e9f49eb51e3113..44ee7e46a2a3e8 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/CreateProject.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/CreateProject.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static com.google.common.base.Preconditions.checkNotNull; import static io.quarkus.devtools.project.codegen.ProjectGenerator.CLASS_NAME; @@ -10,9 +10,10 @@ import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_VERSION; import static io.quarkus.devtools.project.codegen.ProjectGenerator.SOURCE_TYPE; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.handlers.CreateProjectCommandHandler; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.codegen.SourceType; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java similarity index 86% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java index b22f23e2b145cc..05b6d85c9808f0 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java @@ -1,10 +1,11 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static com.google.common.base.Preconditions.checkNotNull; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.handlers.ListExtensionsCommandHandler; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.extensions.ExtensionsManager; import io.quarkus.platform.tools.ToolsConstants; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/RemoveExtensions.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java similarity index 83% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/RemoveExtensions.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java index e44af4d6c6b871..402eced8af3ff9 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/RemoveExtensions.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java @@ -1,10 +1,11 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static com.google.common.base.Preconditions.checkNotNull; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.handlers.RemoveExtensionsCommandHandler; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.extensions.ExtensionsManager; import io.quarkus.platform.tools.ToolsConstants; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandException.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandException.java similarity index 87% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandException.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandException.java index cc85487df14ee8..eb13d45624e734 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandException.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandException.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands.data; +package io.quarkus.devtools.commands.data; public class QuarkusCommandException extends Exception { diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandInvocation.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java similarity index 97% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandInvocation.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java index 75abaefc6f2e6b..c2ff4b506364f9 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandInvocation.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands.data; +package io.quarkus.devtools.commands.data; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandOutcome.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandOutcome.java similarity index 91% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandOutcome.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandOutcome.java index 8e8ee3f3a8d980..e04e6e2f6a2839 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/QuarkusCommandOutcome.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandOutcome.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands.data; +package io.quarkus.devtools.commands.data; public class QuarkusCommandOutcome extends ValueMap { diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/SelectionResult.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java similarity index 94% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/SelectionResult.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java index d96119d97fd799..c97d6afcc0a313 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/SelectionResult.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands.data; +package io.quarkus.devtools.commands.data; import io.quarkus.dependencies.Extension; import java.util.Collections; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/ValueMap.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/ValueMap.java similarity index 98% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/ValueMap.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/ValueMap.java index e2f100d06a3f2f..8d99fc794f6e14 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/data/ValueMap.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/data/ValueMap.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands.data; +package io.quarkus.devtools.commands.data; import java.util.HashMap; import java.util.Map; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/AddExtensionsCommandHandler.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java similarity index 76% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/AddExtensionsCommandHandler.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java index 53e772eaa9a007..5cf56a7e0dc428 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/AddExtensionsCommandHandler.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java @@ -1,12 +1,13 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands.handlers; -import static io.quarkus.cli.commands.AddExtensions.EXTENSIONS_MANAGER; -import static io.quarkus.cli.commands.QuarkusCommandHandlers.computeExtensionsFromQuery; +import static io.quarkus.devtools.commands.AddExtensions.EXTENSIONS_MANAGER; +import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeExtensionsFromQuery; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.AddExtensions; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.extensions.ExtensionsManager; import java.io.IOException; import java.util.Collections; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/CreateProjectCommandHandler.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java similarity index 90% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/CreateProjectCommandHandler.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java index 9f24a9aa6a5f75..d6a4d1569c2ee1 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/CreateProjectCommandHandler.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java @@ -1,14 +1,14 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands.handlers; -import static io.quarkus.cli.commands.QuarkusCommandHandlers.computeExtensionsFromQuery; +import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeExtensionsFromQuery; import static io.quarkus.devtools.project.codegen.ProjectGenerator.*; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.buildfile.GradleBuildFilesCreator; +import io.quarkus.devtools.project.buildfile.GradleBuildFilesCreator; import io.quarkus.devtools.project.codegen.ProjectGenerator; import io.quarkus.devtools.project.codegen.ProjectGeneratorRegistry; import io.quarkus.devtools.project.codegen.SourceType; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensionsCommandHandler.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java similarity index 95% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensionsCommandHandler.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java index d59f39acf6e62f..e77e91c55b54f9 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensionsCommandHandler.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java @@ -1,11 +1,12 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands.handlers; import static java.util.stream.Collectors.toMap; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.ListExtensions; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.extensions.ExtensionsManager; import io.quarkus.platform.tools.MessageWriter; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandler.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandler.java new file mode 100644 index 00000000000000..dfc372a8b3ce31 --- /dev/null +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandler.java @@ -0,0 +1,10 @@ +package io.quarkus.devtools.commands.handlers; + +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; + +public interface QuarkusCommandHandler { + + QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws QuarkusCommandException; +} diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/QuarkusCommandHandlers.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java similarity index 98% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/QuarkusCommandHandlers.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java index 2766190df0632b..8ea62d9ea5b620 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/QuarkusCommandHandlers.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java @@ -1,12 +1,12 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands.handlers; import static io.quarkus.platform.tools.ConsoleMessageFormat.NOK; import static io.quarkus.platform.tools.ConsoleMessageFormat.nok; import com.google.common.collect.ImmutableList; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.SelectionResult; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.SelectionResult; import io.quarkus.devtools.project.extensions.Extensions; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/RemoveExtensionsCommandHandler.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java similarity index 77% rename from independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/RemoveExtensionsCommandHandler.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java index db11a0d728ab0e..d3f8421825c647 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/RemoveExtensionsCommandHandler.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java @@ -1,13 +1,14 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands.handlers; -import static io.quarkus.cli.commands.RemoveExtensions.EXTENSIONS_MANAGER; -import static io.quarkus.cli.commands.QuarkusCommandHandlers.computeExtensionsFromQuery; +import static io.quarkus.devtools.commands.RemoveExtensions.EXTENSIONS_MANAGER; +import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeExtensionsFromQuery; import com.google.common.collect.ImmutableSet; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.RemoveExtensions; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.extensions.ExtensionsManager; import java.io.IOException; import java.util.Collections; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/BuildTool.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/BuildTool.java index 8ebd65de5ab662..78b5a641c834c2 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/BuildTool.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/BuildTool.java @@ -1,7 +1,7 @@ package io.quarkus.devtools.project; -import io.quarkus.devtools.buildfile.GenericGradleBuildFile; -import io.quarkus.devtools.buildfile.MavenBuildFile; +import io.quarkus.devtools.project.buildfile.GenericGradleBuildFile; +import io.quarkus.devtools.project.buildfile.MavenBuildFile; import io.quarkus.devtools.project.extensions.ExtensionsManager; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; import java.nio.file.Path; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java index abfa56f1f30628..a4c9eaa58b639b 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java @@ -2,7 +2,7 @@ import static com.google.common.base.Preconditions.checkNotNull; -import io.quarkus.devtools.buildfile.MavenBuildFile; +import io.quarkus.devtools.project.buildfile.MavenBuildFile; import io.quarkus.devtools.project.extensions.ExtensionsManager; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; import java.nio.file.Path; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/AbstractGradleBuildFile.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java similarity index 99% rename from independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/AbstractGradleBuildFile.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java index 582b1a9882c787..bc5b04f511bddb 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/AbstractGradleBuildFile.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java @@ -1,4 +1,4 @@ -package io.quarkus.devtools.buildfile; +package io.quarkus.devtools.project.buildfile; import io.quarkus.devtools.project.BuildTool; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/BuildFile.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java similarity index 99% rename from independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/BuildFile.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java index e6c3cd65b780d4..e1b98d35e3cdbd 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/BuildFile.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java @@ -1,4 +1,4 @@ -package io.quarkus.devtools.buildfile; +package io.quarkus.devtools.project.buildfile; import static com.google.common.base.Preconditions.checkNotNull; import static io.quarkus.devtools.project.extensions.Extensions.key; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/GenericGradleBuildFile.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java similarity index 96% rename from independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/GenericGradleBuildFile.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java index d6246a24d0da95..829b40465a7af9 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/GenericGradleBuildFile.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java @@ -1,4 +1,4 @@ -package io.quarkus.devtools.buildfile; +package io.quarkus.devtools.project.buildfile; import io.quarkus.dependencies.Extension; import io.quarkus.devtools.project.BuildTool; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/GradleBuildFilesCreator.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/GradleBuildFilesCreator.java similarity index 98% rename from independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/GradleBuildFilesCreator.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/GradleBuildFilesCreator.java index 87e9bba54d075f..aaf18e4b402aba 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/GradleBuildFilesCreator.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/GradleBuildFilesCreator.java @@ -1,6 +1,6 @@ -package io.quarkus.devtools.buildfile; +package io.quarkus.devtools.project.buildfile; -import static io.quarkus.devtools.buildfile.BuildFile.isDefinedInRegistry; +import static io.quarkus.devtools.project.buildfile.BuildFile.isDefinedInRegistry; import io.quarkus.dependencies.Extension; import io.quarkus.devtools.project.QuarkusProject; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/MavenBuildFile.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java similarity index 98% rename from independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/MavenBuildFile.java rename to independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java index 902edc2a7aa647..9a79a6017094e0 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/buildfile/MavenBuildFile.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java @@ -1,4 +1,4 @@ -package io.quarkus.devtools.buildfile; +package io.quarkus.devtools.project.buildfile; import io.quarkus.devtools.project.BuildTool; import io.quarkus.maven.utilities.MojoUtils; diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java index 825f09499361d8..575ac806428bb6 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java @@ -1,6 +1,6 @@ package io.quarkus.devtools.project.codegen; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import java.io.IOException; public interface ProjectGenerator { diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGenerator.java b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGenerator.java index 70bde46bc7534b..06be3d4e82d461 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGenerator.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGenerator.java @@ -2,7 +2,7 @@ import static java.lang.String.format; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.codegen.ProjectGenerator; import io.quarkus.devtools.project.codegen.SourceType; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AbstractAddExtensionsTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java similarity index 97% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AbstractAddExtensionsTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java index d0d377c1a8975e..a8aad92c648cd2 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AbstractAddExtensionsTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java @@ -1,9 +1,9 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static java.util.Arrays.asList; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AbstractRemoveExtensionsTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java similarity index 96% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AbstractRemoveExtensionsTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java index 364acafb599225..9be4524fa05089 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AbstractRemoveExtensionsTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java @@ -1,9 +1,9 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static java.util.Arrays.asList; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AddGradleExtensionsTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java similarity index 93% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AddGradleExtensionsTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java index 7cc378d9567d0e..553fcb373760b4 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AddGradleExtensionsTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java @@ -1,11 +1,11 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import com.google.common.collect.ImmutableList; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.QuarkusProject; -import io.quarkus.devtools.buildfile.AbstractGradleBuildFile; +import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; import java.io.IOException; import java.nio.file.Files; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AddMavenExtensionsTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java similarity index 91% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AddMavenExtensionsTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java index ed42efcf0e9782..904777bf8917ef 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/AddMavenExtensionsTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java @@ -1,7 +1,7 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.maven.utilities.MojoUtils; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/CreateProjectTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java similarity index 97% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/CreateProjectTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java index 75953171e3f406..8bc7c11aea8069 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/CreateProjectTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -6,8 +6,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.codegen.writer.FileProjectWriter; import io.quarkus.maven.utilities.MojoUtils; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/ListExtensionsTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java similarity index 98% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/ListExtensionsTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java index 802b33a98094d0..a0b797e8ac9762 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/ListExtensionsTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import static io.quarkus.maven.utilities.MojoUtils.readPom; import static java.util.Arrays.asList; @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.maven.utilities.MojoUtils; import io.quarkus.maven.utilities.QuarkusDependencyPredicate; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/PlatformAwareTestBase.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/PlatformAwareTestBase.java similarity index 98% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/PlatformAwareTestBase.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/PlatformAwareTestBase.java index d9a9541f655285..33b1278cd484df 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/PlatformAwareTestBase.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/PlatformAwareTestBase.java @@ -1,4 +1,4 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; import io.quarkus.platform.tools.config.QuarkusPlatformConfig; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/RemoveGradleExtensionsTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java similarity index 94% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/RemoveGradleExtensionsTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java index 07eacd18b5f4c9..963af786163e6a 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/RemoveGradleExtensionsTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java @@ -1,7 +1,7 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/RemoveMavenExtensionsTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java similarity index 92% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/RemoveMavenExtensionsTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java index 6a6b3d173b92b9..febaba8565c341 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/RemoveMavenExtensionsTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java @@ -1,7 +1,7 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.maven.utilities.MojoUtils; import java.io.File; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/QuarkusCommandHandlersTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java similarity index 97% rename from independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/QuarkusCommandHandlersTest.java rename to independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java index 958a884d3149eb..e87d46a1e4ef23 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/cli/commands/QuarkusCommandHandlersTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java @@ -1,10 +1,10 @@ -package io.quarkus.cli.commands; +package io.quarkus.devtools.commands.handlers; -import static io.quarkus.cli.commands.QuarkusCommandHandlers.select; +import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.select; import static java.util.Arrays.asList; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.data.SelectionResult; +import io.quarkus.devtools.commands.data.SelectionResult; import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGeneratorTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGeneratorTest.java index dfd1997904c033..2e3255c76aff86 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGeneratorTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGeneratorTest.java @@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import io.quarkus.bootstrap.util.IoUtils; -import io.quarkus.cli.commands.PlatformAwareTestBase; -import io.quarkus.cli.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.PlatformAwareTestBase; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.codegen.SourceType; import io.quarkus.devtools.project.codegen.writer.ProjectWriter; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java index 8416a0c77cd600..4b522f93f335fc 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java @@ -6,11 +6,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.cli.commands.CreateProject; -import io.quarkus.cli.commands.CreateProjectTest; -import io.quarkus.cli.commands.PlatformAwareTestBase; -import io.quarkus.cli.commands.data.QuarkusCommandException; -import io.quarkus.cli.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.CreateProject; +import io.quarkus.devtools.commands.CreateProjectTest; +import io.quarkus.devtools.commands.PlatformAwareTestBase; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.project.QuarkusProject; import java.io.File; import java.io.FileInputStream; diff --git a/independent-projects/tools/common/src/test/java/io/quarkus/test/platform/descriptor/CombinedQuarkusPlatformDescriptorTest.java b/independent-projects/tools/common/src/test/java/io/quarkus/test/platform/descriptor/CombinedQuarkusPlatformDescriptorTest.java index 09eb24e28ebfde..f9da268b93ccc3 100644 --- a/independent-projects/tools/common/src/test/java/io/quarkus/test/platform/descriptor/CombinedQuarkusPlatformDescriptorTest.java +++ b/independent-projects/tools/common/src/test/java/io/quarkus/test/platform/descriptor/CombinedQuarkusPlatformDescriptorTest.java @@ -6,7 +6,7 @@ import io.quarkus.dependencies.Category; import io.quarkus.dependencies.Extension; -import io.quarkus.cli.commands.PlatformAwareTestBase; +import io.quarkus.devtools.commands.PlatformAwareTestBase; import io.quarkus.platform.descriptor.CombinedQuarkusPlatformDescriptor; import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor; import java.util.List;