Merge pull request quarkusio#17610 from ebullient/jbang-main

Use main.java for JBang projects
gsmet · Jun 3, 2021 · 5f7622e · 5f7622e
2 parents 50241ee + 2f8cc95
commit 5f7622e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java
@@ -106,6 +106,6 @@ Path valdiateJBangSourcePackage(Path project, String name) {
         Assertions.assertTrue(packagePath.toFile().isDirectory(),
                 "Package directory should be a directory: " + packagePath.toAbsolutePath().toString());
 
-        return packagePath.resolve("GreetingResource.java");
+        return packagePath.resolve("main.java");
     }
 }
diff --git a/...estarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/codestart.yml b/...estarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/codestart.yml
@@ -5,7 +5,7 @@ language:
   base:
     data:
       command:
-        class-name: GreetingCommand
+        class-name: main
         name: Greeting
     dependencies:
       - io.quarkus:quarkus-picocli
diff --git a/...starts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/codestart.yml b/...starts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/codestart.yml
@@ -5,7 +5,7 @@ language:
   base:
     data:
       resource:
-        class-name: GreetingResource
+        class-name: main
         path: "/hello-resteasy"
         response: "Hello RESTEasy"
     dependencies:

diff --git a/...c/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java b/...c/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java
@@ -33,7 +33,7 @@ void generateDefaultProject(TestInfo testInfo) throws Throwable {
         final Path projectDir = testDirPath.resolve("default");
         getCatalog().createProject(input).generate(projectDir);
         assertThatDirectoryTreeMatchSnapshots(testInfo, projectDir);
-        assertThatMatchSnapshot(testInfo, projectDir, "src/GreetingResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main.java");
     }
 
     @Test
@@ -47,7 +47,7 @@ void generatePicocliProject(TestInfo testInfo) throws Throwable {
         final Path projectDir = testDirPath.resolve("picocli");
         getCatalog().createProject(input).generate(projectDir);
         assertThatDirectoryTreeMatchSnapshots(testInfo, projectDir);
-        assertThatMatchSnapshot(testInfo, projectDir, "src/GreetingCommand.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main.java");
     }
 
     private QuarkusJBangCodestartCatalog getCatalog() throws IOException {

diff --git a/..._snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot b/..._snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
@@ -4,4 +4,4 @@ README.md
 jbang
 jbang.cmd
 src/
-src/GreetingResource.java
+src/main.java
diff --git a/...eDefaultProject/src_GreetingResource.java → ...Test/generateDefaultProject/src_main.java b/...eDefaultProject/src_GreetingResource.java → ...Test/generateDefaultProject/src_main.java
@@ -11,7 +11,7 @@
 
 @Path("/hello-resteasy")
 @ApplicationScoped
-public class GreetingResource {
+public class main {
 
     @GET
     public String sayHello() {

diff --git a/..._snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/dir-tree.snapshot b/..._snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/dir-tree.snapshot
@@ -4,4 +4,4 @@ README.md
 jbang
 jbang.cmd
 src/
-src/GreetingCommand.java
+src/main.java
diff --git a/...tePicocliProject/src_GreetingCommand.java → ...Test/generatePicocliProject/src_main.java b/...tePicocliProject/src_GreetingCommand.java → ...Test/generatePicocliProject/src_main.java
@@ -9,7 +9,7 @@
 import picocli.CommandLine.Parameters;
 
 @Command(name = "Greeting", mixinStandardHelpOptions = true)
-public class GreetingCommand {
+public class main {
 
     @Parameters(paramLabel = "<name>", defaultValue = "picocli",
         description = "Your name.")

diff --git a/...ion-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateJBangProjectTest.java b/...ion-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateJBangProjectTest.java
@@ -29,7 +29,7 @@ public void createRESTEasy() throws Exception {
 
         assertThat(projectDir.resolve("jbang")).exists();
 
-        assertThat(projectDir.resolve("src/GreetingResource.java"))
+        assertThat(projectDir.resolve("src/main.java"))
                 .exists()
                 .satisfies(checkContains("//usr/bin/env jbang \"$0\" \"$@\" ; exit $?"))
                 .satisfies(checkContains("//DEPS io.quarkus:quarkus-resteasy"));
@@ -45,7 +45,7 @@ public void createRESTEasyWithNoJBangWrapper() throws Exception {
 
         assertThat(projectDir.resolve("jbang")).doesNotExist();
 
-        assertThat(projectDir.resolve("src/GreetingResource.java"))
+        assertThat(projectDir.resolve("src/main.java"))
                 .exists()
                 .satisfies(checkContains("//usr/bin/env jbang \"$0\" \"$@\" ; exit $?"))
                 .satisfies(checkContains("//DEPS io.quarkus:quarkus-resteasy"));
@@ -65,7 +65,7 @@ public void createRESTEasyWithExtensions() throws Exception {
 
         assertThat(projectDir.resolve("jbang")).exists();
 
-        assertThat(projectDir.resolve("src/GreetingResource.java"))
+        assertThat(projectDir.resolve("src/main.java"))
                 .exists()
                 .satisfies(checkContains("//usr/bin/env jbang \"$0\" \"$@\" ; exit $?"))
                 .satisfies(checkContains("//DEPS io.quarkus:quarkus-resteasy"))