Merge pull request #12318 from ia3andy/add-codestarts-selectable

Allow codestarts to be manually selected in CreateProject command
quarkusio · Sep 24, 2020 · 312d4b4 · 312d4b4
2 parents 080a245 + bfe1015
commit 312d4b4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/...descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/codestart.yml b/...descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/codestart.yml
@@ -17,11 +17,11 @@ language:
         guide: https://quarkus.io/guides/gradle-tooling
         guide-native: https://quarkus.io/guides/gradle-tooling#building-a-native-executable
         cmd:
-          dev: ./gradlew quarkusDev
-          package: ./gradlew quarkusBuild
-          package-uberjar:  ./gradlew quarkusBuild --uber-jar
-          package-native: ./gradlew build -Dquarkus.package.type=native
-          package-native-container: ./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
+          dev: gradle quarkusDev
+          package: gradle quarkusBuild
+          package-uberjar:  gradle quarkusBuild --uber-jar
+          package-native: gradle build -Dquarkus.package.type=native
+          package-native-container: gradle build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
   kotlin:
     dependencies:
       - org.jetbrains.kotlin:kotlin-stdlib-jdk8

diff --git a/...jects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java b/...jects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java
@@ -36,6 +36,7 @@ public class CreateProject {
     public static final String NO_DOCKERFILES = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-dockerfiles");
     public static final String NO_BUILDTOOL_WRAPPER = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-buildtool-wrapper");
     public static final String NO_EXAMPLES = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-examples");
+    public static final String CODESTARTS = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "codestarts");
 
     private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");
 
@@ -105,6 +106,11 @@ public CreateProject extensions(Set<String> extensions) {
         return this;
     }
 
+    public CreateProject codestarts(Set<String> codestarts) {
+        setValue(CODESTARTS, codestarts);
+        return this;
+    }
+
     public CreateProject codestartsEnabled(boolean value) {
         setValue(CODESTARTS_ENABLED, value);
         return this;

diff --git a/...mmon/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java b/...mmon/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
@@ -1,5 +1,6 @@
 package io.quarkus.devtools.commands.handlers;
 
+import static io.quarkus.devtools.commands.CreateProject.CODESTARTS;
 import static io.quarkus.devtools.commands.CreateProject.CODESTARTS_ENABLED;
 import static io.quarkus.devtools.commands.CreateProject.NO_BUILDTOOL_WRAPPER;
 import static io.quarkus.devtools.commands.CreateProject.NO_DOCKERFILES;
@@ -32,6 +33,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -78,6 +80,7 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
                 final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
                         .addExtensions(extensionsToAdd)
                         .buildTool(invocation.getQuarkusProject().getBuildTool())
+                        .addCodestarts(invocation.getValue(CODESTARTS, new HashSet<>()))
                         .noExamples(invocation.getValue(NO_EXAMPLES, false))
                         .noBuildToolWrapper(invocation.getValue(NO_BUILDTOOL_WRAPPER, false))
                         .noDockerfiles(invocation.getValue(NO_DOCKERFILES, false))