Pivot to extension codestarts instead of examples

quarkusio · Apr 21, 2021 · 4780e55 · 4780e55
1 parent e4f1d6b
commit 4780e55
Show file tree

Hide file tree

Showing 264 changed files with 1,015 additions and 2,155 deletions.
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Create.java b/devtools/cli/src/main/java/io/quarkus/cli/Create.java
@@ -27,12 +27,12 @@ public class Create extends BaseSubCommand implements Callable<Integer> {
     String version = "1.0.0-SNAPSHOT";
 
     @CommandLine.Option(names = { "-0",
-            "--no-examples" }, order = 4, description = "Generate without example code.")
-    boolean noExamples = false;
+            "--no-code" }, order = 4, description = "Generate an empty Quarkus project.")
+    boolean noCode = false;
 
     @CommandLine.Option(names = { "-x",
-            "--examples" }, order = 4, description = "Choose which example(s) you want in the generated Quarkus application.")
-    Set<String> examples;
+            "--example" }, order = 4, description = "Choose a specific example for the generated Quarkus application.")
+    String example;
 
     @CommandLine.ArgGroup()
     TargetBuildTool targetBuildTool = new TargetBuildTool();
@@ -116,9 +116,9 @@ public Integer call() throws Exception {
                     .artifactId(artifactId)
                     .version(version)
                     .sourceType(sourceType)
-                    .overrideExamples(examples)
+                    .example(example)
                     .extensions(extensions)
-                    .noExamples(noExamples)
+                    .noCode(noCode)
                     .execute().isSuccess();
 
             if (status) {

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
@@ -75,16 +75,13 @@ public class CreateProjectMojo extends AbstractMojo {
     private String projectVersion;
 
     /**
-     * When true, do not include any example code in the generated Quarkus project.
+     * When true, do not include any code in the generated Quarkus project.
      */
-    @Parameter(property = "noExamples", defaultValue = "false")
-    private boolean noExamples;
+    @Parameter(property = "noCode", defaultValue = "false")
+    private boolean noCode;
 
-    /**
-     * Choose which example(s) you want in the generated Quarkus application.
-     */
-    @Parameter(property = "examples")
-    private Set<String> examples;
+    @Parameter(property = "example")
+    private String example;
 
     /**
      * Group ID of the target platform BOM
@@ -286,8 +283,8 @@ public void execute() throws MojoExecutionException {
                     .className(className)
                     .packageName(packageName)
                     .extensions(extensions)
-                    .overrideExamples(examples)
-                    .noExamples(noExamples);
+                    .example(example)
+                    .noCode(noCode);
             if (path != null) {
                 createProject.setValue("path", path);
             }
@@ -420,7 +417,7 @@ private void askTheUserForMissingValues() throws MojoExecutionException {
                         DEFAULT_VERSION);
             }
 
-            if (examples.isEmpty()) {
+            if (!noCode && StringUtils.isBlank(example)) {
                 if (extensions.isEmpty()) {
                     extensions = Arrays
                             .stream(prompter
@@ -430,8 +427,8 @@ private void askTheUserForMissingValues() throws MojoExecutionException {
                             .map(String::trim).filter(StringUtils::isNotEmpty).collect(Collectors.toSet());
                 }
                 String answer = prompter.promptWithDefaultValue(
-                        "Do you want example code to get started (yes), or just an empty project (no)", "yes");
-                noExamples = answer.startsWith("n");
+                        "Would you like some code to start (yes), or just an empty Quarkus project (no)", "yes");
+                noCode = answer.startsWith("n");
             }
         } catch (IOException e) {
             throw new MojoExecutionException("Unable to get user input", e);

diff --git a/...on-lambda-example/base/README.tpl.qute.md → ...on-lambda-example/base/README.tpl.qute.md b/...on-lambda-example/base/README.tpl.qute.md → ...on-lambda-example/base/README.tpl.qute.md
diff --git a/...mples/amazon-lambda-example/codestart.yml → ...mples/amazon-lambda-example/codestart.yml b/...mples/amazon-lambda-example/codestart.yml → ...mples/amazon-lambda-example/codestart.yml
@@ -1,9 +1,7 @@
 name: amazon-lambda-example
 ref: amazon-lambda
 type: code
-tags:
-  - example
-  - singleton-example
+tags: example
 metadata:
   title: Amazon Lambda Integration example
   description: This example contains a Quarkus Greeting Lambda ready for Amazon.

diff --git a/...s/amazon-lambda-example/java/payload.json → ...s/amazon-lambda-example/java/payload.json b/...s/amazon-lambda-example/java/payload.json → ...s/amazon-lambda-example/java/payload.json
diff --git a/.../java/org/acme/lambda/GreetingLambda.java → .../java/org/acme/lambda/GreetingLambda.java b/.../java/org/acme/lambda/GreetingLambda.java → .../java/org/acme/lambda/GreetingLambda.java
diff --git a/...src/main/java/org/acme/lambda/Person.java → ...src/main/java/org/acme/lambda/Person.java b/...src/main/java/org/acme/lambda/Person.java → ...src/main/java/org/acme/lambda/Person.java
diff --git a/.../org/acme/lambda/LambdaHandlerTestIT.java → .../org/acme/lambda/LambdaHandlerTestIT.java b/.../org/acme/lambda/LambdaHandlerTestIT.java → .../org/acme/lambda/LambdaHandlerTestIT.java
diff --git a/...va/org/acme/lambda/LambdaHandlerTest.java → ...va/org/acme/lambda/LambdaHandlerTest.java b/...va/org/acme/lambda/LambdaHandlerTest.java → ...va/org/acme/lambda/LambdaHandlerTest.java
diff --git a/...e/java/src/test/resources/application.yml → ...e/java/src/test/resources/application.yml b/...e/java/src/test/resources/application.yml → ...e/java/src/test/resources/application.yml
diff --git a/...ions-http-example/base/README.tpl.qute.md → ...ions-http-example/base/README.tpl.qute.md b/...ions-http-example/base/README.tpl.qute.md → ...ions-http-example/base/README.tpl.qute.md
diff --git a/.../base/azure-config/function.tpl.qute.json → .../base/azure-config/function.tpl.qute.json b/.../base/azure-config/function.tpl.qute.json → .../base/azure-config/function.tpl.qute.json
diff --git a/...-http-example/base/azure-config/host.json → ...-http-example/base/azure-config/host.json b/...-http-example/base/azure-config/host.json → ...-http-example/base/azure-config/host.json
diff --git a/...ple/base/azure-config/local.settings.json → ...ple/base/azure-config/local.settings.json b/...ple/base/azure-config/local.settings.json → ...ple/base/azure-config/local.settings.json
diff --git a/...ctions-http-example/base/pom.tpl.qute.xml → ...ctions-http-example/base/pom.tpl.qute.xml b/...ctions-http-example/base/pom.tpl.qute.xml → ...ctions-http-example/base/pom.tpl.qute.xml
diff --git a/...c/main/resources/application.tpl.qute.yml → ...c/main/resources/application.tpl.qute.yml b/...c/main/resources/application.tpl.qute.yml → ...c/main/resources/application.tpl.qute.yml
diff --git a/...zure-functions-http-example/codestart.yml → ...zure-functions-http-example/codestart.yml b/...zure-functions-http-example/codestart.yml → ...zure-functions-http-example/codestart.yml
@@ -3,7 +3,6 @@ ref: azure-functions-http
 type: code
 tags:
   - example
-  - singleton-example
   - maven-only
 metadata:
   title: Azure Functions HTTP Integration example

diff --git a/...in/resources/codestarts/quarkus/examples/config-example/base/README.tpl.qute.md b/...in/resources/codestarts/quarkus/examples/config-example/base/README.tpl.qute.md
diff --git a/...ources/codestarts/quarkus/examples/config-example/base/src/main/resources/application.yml b/...ources/codestarts/quarkus/examples/config-example/base/src/main/resources/application.yml
diff --git a/...on-codestarts/src/main/resources/codestarts/quarkus/examples/config-example/codestart.yml b/...on-codestarts/src/main/resources/codestarts/quarkus/examples/config-example/codestart.yml
diff --git a/...ts/quarkus/examples/config-example/java/src/main/java/org/acme/config/ConfigResource.java b/...ts/quarkus/examples/config-example/java/src/main/java/org/acme/config/ConfigResource.java
diff --git a/.../quarkus/examples/config-example/kotlin/src/main/kotlin/org/acme/config/ConfigResource.kt b/.../quarkus/examples/config-example/kotlin/src/main/kotlin/org/acme/config/ConfigResource.kt
diff --git a/...on-lambda-example/base/README.tpl.qute.md → ...on-lambda-example/base/README.tpl.qute.md b/...on-lambda-example/base/README.tpl.qute.md → ...on-lambda-example/base/README.tpl.qute.md
diff --git a/...funqy-amazon-lambda-example/codestart.yml → ...funqy-amazon-lambda-example/codestart.yml b/...funqy-amazon-lambda-example/codestart.yml → ...funqy-amazon-lambda-example/codestart.yml
@@ -1,9 +1,7 @@
 name: funqy-amazon-lambda-example
 ref: funqy-amazon-lambda
 type: code
-tags:
-  - example
-  - singleton-example
+tags: example
 metadata:
   title: Funqy Amazon Lambda Binding example
   description: This example contains a Quarkus Funqy Greeting Function ready for Amazon Lambda.

diff --git a/...y-amazon-lambda-example/java/payload.json → ...y-amazon-lambda-example/java/payload.json b/...y-amazon-lambda-example/java/payload.json → ...y-amazon-lambda-example/java/payload.json
diff --git a/...java/org/acme/funqy/GreetingFunction.java → ...java/org/acme/funqy/GreetingFunction.java b/...java/org/acme/funqy/GreetingFunction.java → ...java/org/acme/funqy/GreetingFunction.java
diff --git a/.../src/main/java/org/acme/funqy/Person.java → .../src/main/java/org/acme/funqy/Person.java b/.../src/main/java/org/acme/funqy/Person.java → .../src/main/java/org/acme/funqy/Person.java
diff --git a/...ive-test/java/org/acme/funqy/FunqyIT.java → ...ive-test/java/org/acme/funqy/FunqyIT.java b/...ive-test/java/org/acme/funqy/FunqyIT.java → ...ive-test/java/org/acme/funqy/FunqyIT.java
diff --git a/...est/java/resources/application.properties → ...est/java/resources/application.properties b/...est/java/resources/application.properties → ...est/java/resources/application.properties
diff --git a/...c/test/java/org/acme/funqy/FunqyTest.java → ...c/test/java/org/acme/funqy/FunqyTest.java b/...c/test/java/org/acme/funqy/FunqyTest.java → ...c/test/java/org/acme/funqy/FunqyTest.java
diff --git a/...e/java/src/test/resources/application.yml → ...e/java/src/test/resources/application.yml b/...e/java/src/test/resources/application.yml → ...e/java/src/test/resources/application.yml
diff --git a/...functions-example/base/README.tpl.qute.md → ...functions-example/base/README.tpl.qute.md b/...functions-example/base/README.tpl.qute.md → ...functions-example/base/README.tpl.qute.md
diff --git a/...gle-cloud-functions-example/codestart.yml → ...gle-cloud-functions-example/codestart.yml b/...gle-cloud-functions-example/codestart.yml → ...gle-cloud-functions-example/codestart.yml
@@ -1,9 +1,7 @@
 name: funqy-google-cloud-functions-example
 ref: funqy-google-cloud-functions
 type: code
-tags:
-  - example
-  - singleton-example
+tags: example
 metadata:
   title: Funqy Google Cloud Functions Integration examples
   description: Examples of Background Functions with Funqy for Quarkus.

diff --git a/...oglecloudfunctions/GreetingFunctions.java → ...oglecloudfunctions/GreetingFunctions.java b/...oglecloudfunctions/GreetingFunctions.java → ...oglecloudfunctions/GreetingFunctions.java
diff --git a/...googlecloudfunctions/GreetingService.java → ...googlecloudfunctions/GreetingService.java b/...googlecloudfunctions/GreetingService.java → ...googlecloudfunctions/GreetingService.java
diff --git a/...odestarts/src/main/resources/codestarts/quarkus/examples/funqy-http-example/codestart.yml b/...odestarts/src/main/resources/codestarts/quarkus/examples/funqy-http-example/codestart.yml
diff --git a/...destarts/quarkus/examples/funqy-http-example/java/src/main/java/org/acme/funqy/Funqy.java b/...destarts/quarkus/examples/funqy-http-example/java/src/main/java/org/acme/funqy/Funqy.java
diff --git a/...arts/quarkus/examples/funqy-http-example/java/src/test/java/org/acme/funqy/FunqyTest.java b/...arts/quarkus/examples/funqy-http-example/java/src/test/java/org/acme/funqy/FunqyTest.java
diff --git a/...ve-events-example/base/README.tpl.qute.md → ...ve-events-example/base/README.tpl.qute.md b/...ve-events-example/base/README.tpl.qute.md → ...ve-events-example/base/README.tpl.qute.md
diff --git a/...unqy-knative-events-example/codestart.yml → ...unqy-knative-events-example/codestart.yml b/...unqy-knative-events-example/codestart.yml → ...unqy-knative-events-example/codestart.yml
@@ -1,9 +1,7 @@
 name: funqy-knative-events-example
 ref: funqy-knative-events
 type: code
-tags:
-  - example
-  - singleton-example
+tags: example
 metadata:
   title: Funqy Knative Events Binding example
   description: This example contains a Quarkus Knative Funqy Function ready for Kubernetes or Openshift.

diff --git a/.../funqy/cloudevent/CloudEventGreeting.java → .../funqy/cloudevent/CloudEventGreeting.java b/.../funqy/cloudevent/CloudEventGreeting.java → .../funqy/cloudevent/CloudEventGreeting.java
diff --git a/...ava/org/acme/funqy/cloudevent/Person.java → ...ava/org/acme/funqy/cloudevent/Person.java b/...ava/org/acme/funqy/cloudevent/Person.java → ...ava/org/acme/funqy/cloudevent/Person.java
diff --git a/.../src/main/k8s/funqy-service.tpl.qute.yaml → .../src/main/k8s/funqy-service.tpl.qute.yaml b/.../src/main/k8s/funqy-service.tpl.qute.yaml → .../src/main/k8s/funqy-service.tpl.qute.yaml
diff --git a/.../src/main/k8s/funqy-trigger.tpl.qute.yaml → .../src/main/k8s/funqy-trigger.tpl.qute.yaml b/.../src/main/k8s/funqy-trigger.tpl.qute.yaml → .../src/main/k8s/funqy-trigger.tpl.qute.yaml
diff --git a/...va/org/acme/funqy/cloudevent/FunqyIT.java → ...va/org/acme/funqy/cloudevent/FunqyIT.java b/...va/org/acme/funqy/cloudevent/FunqyIT.java → ...va/org/acme/funqy/cloudevent/FunqyIT.java
diff --git a/.../org/acme/funqy/cloudevent/FunqyTest.java → .../org/acme/funqy/cloudevent/FunqyTest.java b/.../org/acme/funqy/cloudevent/FunqyTest.java → .../org/acme/funqy/cloudevent/FunqyTest.java
diff --git a/...functions-example/base/README.tpl.qute.md → ...functions-example/base/README.tpl.qute.md b/...functions-example/base/README.tpl.qute.md → ...functions-example/base/README.tpl.qute.md
diff --git a/...gle-cloud-functions-example/codestart.yml → ...gle-cloud-functions-example/codestart.yml b/...gle-cloud-functions-example/codestart.yml → ...gle-cloud-functions-example/codestart.yml
@@ -1,9 +1,7 @@
 name: google-cloud-functions-example
 ref: google-cloud-functions
 type: code
-tags:
-  - example
-  - singleton-example
+tags: example
 metadata:
   title: Google Cloud Functions Integration examples
   description: Examples of Google Cloud HTTP and Background Functions for Quarkus.

diff --git a/...nctions/HelloWorldBackgroundFunction.java → ...nctions/HelloWorldBackgroundFunction.java b/...nctions/HelloWorldBackgroundFunction.java → ...nctions/HelloWorldBackgroundFunction.java
diff --git a/...loudfunctions/HelloWorldHttpFunction.java → ...loudfunctions/HelloWorldHttpFunction.java b/...loudfunctions/HelloWorldHttpFunction.java → ...loudfunctions/HelloWorldHttpFunction.java
diff --git a/...ions-http-example/base/README.tpl.qute.md → ...ions-http-example/base/README.tpl.qute.md b/...ions-http-example/base/README.tpl.qute.md → ...ions-http-example/base/README.tpl.qute.md
diff --git a/...loud-functions-http-example/codestart.yml → ...loud-functions-http-example/codestart.yml b/...loud-functions-http-example/codestart.yml → ...loud-functions-http-example/codestart.yml
@@ -1,9 +1,7 @@
 name: google-cloud-functions-http-example
 ref: google-cloud-functions-http
 type: code
-tags:
-  - example
-  - singleton-example
+tags: example
 metadata:
   title: Google Cloud Functions HTTP Integration examples
   description: Examples of Google Cloud HTTP functions for Quarkus written with RESTEasy (JAX-RS), Undertow (Servlet), Vert.x Web, or Funqy HTTP.

diff --git a/...e/googlecloudfunctions/GreetingFunqy.java → ...e/googlecloudfunctions/GreetingFunqy.java b/...e/googlecloudfunctions/GreetingFunqy.java → ...e/googlecloudfunctions/GreetingFunqy.java
diff --git a/...ooglecloudfunctions/GreetingResource.java → ...ooglecloudfunctions/GreetingResource.java b/...ooglecloudfunctions/GreetingResource.java → ...ooglecloudfunctions/GreetingResource.java
diff --git a/.../googlecloudfunctions/GreetingRoutes.java → .../googlecloudfunctions/GreetingRoutes.java b/.../googlecloudfunctions/GreetingRoutes.java → .../googlecloudfunctions/GreetingRoutes.java
diff --git a/...googlecloudfunctions/GreetingServlet.java → ...googlecloudfunctions/GreetingServlet.java b/...googlecloudfunctions/GreetingServlet.java → ...googlecloudfunctions/GreetingServlet.java
diff --git a/...us/examples/logging-json/base/src/main/resources/META-INF/resources/index.entry.qute.html b/...us/examples/logging-json/base/src/main/resources/META-INF/resources/index.entry.qute.html
diff --git a/...esources/codestarts/quarkus/examples/logging-json/base/src/main/resources/application.yml b/...esources/codestarts/quarkus/examples/logging-json/base/src/main/resources/application.yml
diff --git a/...sion-codestarts/src/main/resources/codestarts/quarkus/examples/logging-json/codestart.yml b/...sion-codestarts/src/main/resources/codestarts/quarkus/examples/logging-json/codestart.yml
diff --git a/...s/examples/logging-json/java/src/main/java/org/acme/logging/json/LoggingJsonResource.java b/...s/examples/logging-json/java/src/main/java/org/acme/logging/json/LoggingJsonResource.java