Merge pull request #11668 from ia3andy/codestarts-up3

quarkusio · Aug 31, 2020 · 9294c07 · 9294c07
2 parents 4e0ed2e + 50f121a
commit 9294c07
Show file tree

Hide file tree

Showing 70 changed files with 979 additions and 510 deletions.
diff --git a/...ptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml b/...ptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml
@@ -6,12 +6,12 @@ output-strategy:
 language:
   base:
     data:
-      quarkus:
-        gradle-plugin:
-          id: io.quarkus
       kotlin:
         version: 1.3.72
     shared-data:
+      quarkus:
+        gradle-plugin:
+          id: io.quarkus
       buildtool:
         build-dir: build
         guide: https://quarkus.io/guides/gradle-tooling

diff --git a/...form-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml b/...form-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml
@@ -6,12 +6,12 @@ output-strategy:
 language:
   base:
     data:
-      quarkus:
-        gradle-plugin:
-          id: io.quarkus
       kotlin:
         version: 1.3.72
     shared-data:
+      quarkus:
+        gradle-plugin:
+          id: io.quarkus
       buildtool:
         build-dir: build
         guide: https://quarkus.io/guides/gradle-tooling

diff --git a/...xample/commandmode-example/base/README.md → ...s/code/commandmode-example/base/README.md b/...xample/commandmode-example/base/README.md → ...s/code/commandmode-example/base/README.md
diff --git a/...example/commandmode-example/codestart.yml → ...ts/code/commandmode-example/codestart.yml b/...example/commandmode-example/codestart.yml → ...ts/code/commandmode-example/codestart.yml
@@ -1,10 +1,13 @@
 name: commandmode-example
 ref: commandmode
-type: example
-fallback: true
+type: code
+tags: example
 language:
   base:
     data:
+      main:
+        class-name: HelloCommando
+      package-name: org.acme.commandmode
       greeting:
         message: "hello"
         default-name: "commando"

diff --git a/...commandmode-example/java/src/main/java/{package-name.dir}/{main.class-name}.tpl.qute.java b/...commandmode-example/java/src/main/java/{package-name.dir}/{main.class-name}.tpl.qute.java
@@ -0,0 +1,19 @@
+package {package-name};
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class {main.class-name} implements QuarkusApplication {
+
+    @Override
+    public int run(String... args) throws Exception {
+        final String name = args.length > 0 ? String.join(" ", args) : "{greeting.default-name}";
+        System.out.println("{greeting.message} " + name);
+        return 0;
+    }
+}
diff --git a/...mmandmode-example/kotlin/src/main/kotlin/{package-name.dir}/{main.class-name}.tpl.qute.kt b/...mmandmode-example/kotlin/src/main/kotlin/{package-name.dir}/{main.class-name}.tpl.qute.kt
@@ -0,0 +1,17 @@
+package {package-name}
+
+import javax.inject.Inject
+
+import io.quarkus.runtime.QuarkusApplication
+import io.quarkus.runtime.annotations.QuarkusMain
+
+@QuarkusMain
+class {main.class-name}: QuarkusApplication {
+
+    override fun run(vararg args: String?): Int {
+        val name =  if (args.isNotEmpty()) args.joinToString(",") else "{greeting.default-name}"
+        println(name)
+        return 0
+    }
+
+}
diff --git a/...odestarts/resteasy-example/base/README.md → ...arts/code/resteasy-example/base/README.md b/...odestarts/resteasy-example/base/README.md → ...arts/code/resteasy-example/base/README.md
diff --git a/...es/META-INF/resources/index.tpl.qute.html → ...es/META-INF/resources/index.tpl.qute.html b/...es/META-INF/resources/index.tpl.qute.html → ...es/META-INF/resources/index.tpl.qute.html
@@ -117,7 +117,7 @@ <h2>What can I do from here?</h2>
         <p>If not already done, run the application in <em>dev mode</em> using: <code>{buildtool.cmd.dev}</code>.
         </p>
         <ul>
-            <li>Open the example <a href="{rest.path}" target="_blank">"/hello"</a> endpoint</li>
+            <li>Open the example <a href="{resource.path}" target="_blank">"/hello"</a> endpoint</li>
             <li>Add REST resources, Servlets, functions and other services in <code>{language.dir.code}</code>.</li>
             <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
             <li>Configure your application in <code>src/main/resources/{config.file-name}</code>.

diff --git a/...codestarts/resteasy-example/codestart.yml → ...tarts/code/resteasy-example/codestart.yml b/...codestarts/resteasy-example/codestart.yml → ...tarts/code/resteasy-example/codestart.yml
@@ -1,11 +1,16 @@
 name: resteasy-example
 ref: resteasy
-type: example
+type: code
+tags: example
 language:
   base:
     data:
-      rest:
+      resource:
+        class-name: ExampleResource
         path: "/resteasy/hello"
         response: "hello"
+      package-name: org.acme.resteasy
+    dependencies:
+      - io.quarkus:quarkus-resteasy
     test-dependencies:
       - io.rest-assured:rest-assured
diff --git a/...me/resteasy/ExampleResource.tpl.qute.java → ....dir}/{resource.class-name}.tpl.qute.java b/...me/resteasy/ExampleResource.tpl.qute.java → ....dir}/{resource.class-name}.tpl.qute.java
@@ -1,16 +1,16 @@
-package org.acme.resteasy;
+package {package-name};
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-@Path("{rest.path}")
-public class ExampleResource {
+@Path("{resource.path}")
+public class {resource.class-name} {
 
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     public String hello() {
-        return "{rest.response}";
+        return "{resource.response}";
     }
 }
diff --git a/...cme/resteasy/NativeExampleResourceIT.java → ...tive{resource.class-name}IT.tpl.qute.java b/...cme/resteasy/NativeExampleResourceIT.java → ...tive{resource.class-name}IT.tpl.qute.java
@@ -1,9 +1,9 @@
-package org.acme.resteasy;
+package {package-name};
 
 import io.quarkus.test.junit.NativeImageTest;
 
 @NativeImageTest
-public class NativeExampleResourceIT extends ExampleResourceTest {
+public class Native{resource.class-name}IT extends {resource.class-name}Test {
 
     // Execute the same tests but in native mode.
 }
diff --git a/...esteasy/ExampleResourceTest.tpl.qute.java → ...}/{resource.class-name}Test.tpl.qute.java b/...esteasy/ExampleResourceTest.tpl.qute.java → ...}/{resource.class-name}Test.tpl.qute.java
@@ -1,4 +1,4 @@
-package org.acme.resteasy;
+package {package-name};
 
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
@@ -7,15 +7,15 @@
 import static org.hamcrest.CoreMatchers.is;
 
 @QuarkusTest
-public class ExampleResourceTest {
+public class {resource.class-name}Test {
 
     @Test
     public void testHelloEndpoint() {
         given()
-          .when().get("{rest.path}")
+          .when().get("{resource.path}")
           .then()
              .statusCode(200)
-             .body(is("{rest.response}"));
+             .body(is("{resource.response}"));
     }
 
 }
diff --git a/...acme/resteasy/ExampleResource.tpl.qute.kt → ...me.dir}/{resource.class-name}.tpl.qute.kt b/...acme/resteasy/ExampleResource.tpl.qute.kt → ...me.dir}/{resource.class-name}.tpl.qute.kt
@@ -1,14 +1,14 @@
-package org.acme.resteasy
+package {package-name}
 
 import javax.ws.rs.GET
 import javax.ws.rs.Path
 import javax.ws.rs.Produces
 import javax.ws.rs.core.MediaType
 
-@Path("{rest.path}")
-class ExampleResource {
+@Path("{resource.path}")
+class {resource.class-name} {
 
     @GET
     @Produces(MediaType.TEXT_PLAIN)
-    fun hello() = "{rest.response}"
+    fun hello() = "{resource.response}"
 }
diff --git a/...otlin/src/native-test/kotlin/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.kt b/...otlin/src/native-test/kotlin/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package {package-name}
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT : {resource.class-name}Test()
diff --git a/.../resteasy/ExampleResourceTest.tpl.qute.kt → ...ir}/{resource.class-name}Test.tpl.qute.kt b/.../resteasy/ExampleResourceTest.tpl.qute.kt → ...ir}/{resource.class-name}Test.tpl.qute.kt
@@ -1,20 +1,20 @@
-package org.acme.resteasy
+package {package-name}
 
 import io.quarkus.test.junit.QuarkusTest
 import io.restassured.RestAssured.given
 import org.hamcrest.CoreMatchers.`is`
 import org.junit.jupiter.api.Test
 
 @QuarkusTest
-class ExampleResourceTest {
+class {resource.class-name}Test {
 
     @Test
     fun testHelloEndpoint() {
         given()
-          .`when`().get("{rest.path}")
+          .`when`().get("{resource.path}")
           .then()
              .statusCode(200)
-             .body(`is`("{rest.response}"))
+             .body(`is`("{resource.response}"))
     }
 
 }
diff --git a/...e/resteasy/ExampleResource.tpl.qute.scala → ...dir}/{resource.class-name}.tpl.qute.scala b/...e/resteasy/ExampleResource.tpl.qute.scala → ...dir}/{resource.class-name}.tpl.qute.scala
@@ -1,12 +1,12 @@
-package org.acme.resteasy
+package {package-name}
 
 import javax.ws.rs.\{GET, Path, Produces}
 import javax.ws.rs.core.MediaType
 
-@Path("{rest.path}")
-class ExampleResource {
+@Path("{resource.path}")
+class {resource.class-name} {
 
     @GET
     @Produces(Array[String](MediaType.TEXT_PLAIN))
-    def hello() = "{rest.response}"
+    def hello() = "{resource.response}"
 }
diff --git a/...ala/src/native-test/scala/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.scala b/...ala/src/native-test/scala/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package {package-name}
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT extends {resource.class-name}Test
diff --git a/...steasy/ExampleResourceTest.tpl.qute.scala → .../{resource.class-name}Test.tpl.qute.scala b/...steasy/ExampleResourceTest.tpl.qute.scala → .../{resource.class-name}Test.tpl.qute.scala
@@ -1,20 +1,20 @@
-package org.acme.resteasy
+package {package-name}
 
 import io.quarkus.test.junit.QuarkusTest
 import io.restassured.RestAssured.given
 import org.hamcrest.CoreMatchers.`is`
 import org.junit.jupiter.api.Test
 
 @QuarkusTest
-class ExampleResourceTest {
+class {resource.class-name}Test {
 
     @Test
     def testHelloEndpoint() = {
         given()
-          .`when`().get("{rest.path}")
+          .`when`().get("{resource.path}")
           .then()
              .statusCode(200)
-             .body(`is`("{rest.response}"))
+             .body(`is`("{resource.response}"))
     }
 
 }
diff --git a/...le/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingMain.tpl.qute.java b/...le/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingMain.tpl.qute.java
diff --git a/...commandmode-example/java/src/main/java/org/acme/commandmode/GreetingService.tpl.qute.java b/...commandmode-example/java/src/main/java/org/acme/commandmode/GreetingService.tpl.qute.java
diff --git a/.../commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingMain.tpl.qute.kt b/.../commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingMain.tpl.qute.kt
diff --git a/...mmandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingService.tpl.qute.kt b/...mmandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingService.tpl.qute.kt
diff --git a/.../bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar b/.../bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar
@@ -7,18 +7,18 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/{project.artifact-id}-jvm .
+# docker build -f src/main/docker/Dockerfile.fast-jar -t quarkus/{project.artifact-id}-fast-jar .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}-jvm
+# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}-fast-jar
 #
 # If you want to include the debug port into your docker image
 # you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
 #
 # Then run the container using :
 #
-# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-jvm
+# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-fast-jar
 #
 ###
 FROM {dockerfile.fast-jar.from}

diff --git a/...latform-descriptor-json/src/main/resources/codestarts/amazon-lambda-example/codestart.yml b/...latform-descriptor-json/src/main/resources/codestarts/amazon-lambda-example/codestart.yml
@@ -1,7 +1,9 @@
----
 name: amazon-lambda-example
 ref: amazon-lambda
-type: example
+type: code
+tags:
+  - example
+  - compatibility-issues
 language:
   base:
     shared-data: