Skip to content

Commit

Permalink
Improved codegen packages names and content
Browse files Browse the repository at this point in the history
  • Loading branch information
ia3andy committed Jun 4, 2020
1 parent 689f28a commit 256650b
Show file tree
Hide file tree
Showing 54 changed files with 130 additions and 118 deletions.
2 changes: 1 addition & 1 deletion devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.cli.commands.data;
package io.quarkus.devtools.commands.data;

public class QuarkusCommandException extends Exception {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.cli.commands.data;
package io.quarkus.devtools.commands.data;

import static com.google.common.base.Preconditions.checkNotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.cli.commands.data;
package io.quarkus.devtools.commands.data;

public class QuarkusCommandOutcome extends ValueMap<QuarkusCommandOutcome> {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.cli.commands.data;
package io.quarkus.devtools.commands.data;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit 256650b

Please sign in to comment.