cli: MVC generator

jknack · jknack · commit 835996b27912 · 2019-08-20T16:17:33.000-03:00
diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/CreateApp.java b/modules/jooby-cli/src/main/java/io/jooby/cli/CreateApp.java
@@ -58,13 +58,13 @@ public class CreateApp extends Command {
   private boolean gradle;
 
   @CommandLine.Option(
-      names = {"-kt", "--kotlin"},
+      names = {"-k", "--kotlin"},
       description = "Generates a Kotlin application"
   )
   private boolean kotlin;
 
   @CommandLine.Option(
-      names = {"-stork"},
+      names = {"-s", "--stork"},
       description = "Add Stork Maven plugin to build (Maven only)"
   )
   private boolean stork;
@@ -76,7 +76,7 @@ public class CreateApp extends Command {
   private boolean interactive;
 
   @CommandLine.Option(
-      names = {"-s", "--server"},
+      names = {"--server"},
       description = "Choose one of the available servers: jetty, netty or undertow"
   )
   private String server;
@@ -87,6 +87,12 @@ public class CreateApp extends Command {
   )
   private boolean docker;
 
+  @CommandLine.Option(
+      names = {"-m", "--mvc"},
+      description = "Generates a MVC application"
+  )
+  private boolean mvc;
+
   @Override public void run(CommandContext ctx) throws Exception {
     Path projectDir = Paths.get(System.getProperty("user.dir"), name);
     if (Files.exists(projectDir)) {
@@ -98,11 +104,9 @@ public class CreateApp extends Command {
     String server;
     boolean stork = !gradle && this.stork;
     if (interactive) {
-      String useGradle = ctx.reader.readLine("Use Gradle (yes/No):");
-      gradle = useGradle.equalsIgnoreCase("y") || useGradle.equals("yes");
+      gradle = yesNo(ctx.reader.readLine("Use Gradle (yes/No): "));
 
-      String useKotlin = ctx.reader.readLine("Use Kotlin (yes/No):");
-      kotlin = useKotlin.equalsIgnoreCase("y") || useKotlin.equals("yes");
+      kotlin = yesNo(ctx.reader.readLine("Use Kotlin (yes/No): "));
 
       packageName = ctx.reader.readLine("Enter a groupId/package: ");
 
@@ -111,6 +115,8 @@ public class CreateApp extends Command {
         version = "1.0.0";
       }
 
+      mvc = yesNo(ctx.reader.readLine("Use MVC (yes/No): "));
+
       server = server(ctx.reader.readLine("Choose a server (jetty, netty or undertow): "));
 
       if (!gradle) {
@@ -163,6 +169,7 @@ public class CreateApp extends Command {
     model.put("gradle", gradle);
     model.put("maven", !gradle);
     model.put("docker", docker);
+    model.put("mvc", mvc);
     model.put("finalArtifactId", finalArtifactId);
 
     ctx.writeTemplate(templateName, model, projectDir.resolve(buildFileName));
@@ -191,6 +198,10 @@ public class CreateApp extends Command {
         .reduce(javaPath, Path::resolve, Path::resolve);
 
     ctx.writeTemplate("App." + extension, model, packagePath.resolve("App." + extension));
+    if (mvc) {
+      ctx.writeTemplate("Controller." + extension, model,
+          packagePath.resolve("Controller." + extension));
+    }
 
     /** Test directories: */
     Path testPath = projectDir.resolve("src").resolve("test");
@@ -204,6 +215,10 @@ public class CreateApp extends Command {
         testPackagePath.resolve("IntegrationTest." + extension));
   }
 
+  private boolean yesNo(String value) {
+    return "y".equalsIgnoreCase(value) || "yes".equalsIgnoreCase(value);
+  }
+
   private void docker(CommandContext ctx, Path dir, Map<String, Object> model) throws IOException {
     boolean gradle = (Boolean) model.get("gradle");
     String dockerfile = gradle ? "docker.gradle" : "docker.maven";
diff --git a/modules/jooby-cli/src/main/resources/cli/App.java.hbs b/modules/jooby-cli/src/main/resources/cli/App.java.hbs
@@ -5,7 +5,11 @@ import io.jooby.Jooby;
 public class App extends Jooby {
 
   {
+    {{#if mvc}}
+    mvc(new Controller());
+    {{else}}
     get("/", ctx -> "Welcome to Jooby!");
+    {{/if}}
   }
 
   public static void main(final String[] args) {
diff --git a/modules/jooby-cli/src/main/resources/cli/App.kt.hbs b/modules/jooby-cli/src/main/resources/cli/App.kt.hbs
@@ -4,9 +4,13 @@ import io.jooby.Kooby
 import io.jooby.runApp
 
 class App: Kooby({
+{{#if mvc}}
+  mvc(Controller())
+{{else}}
   get("/") {
     "Welcome to Jooby!"
   }
+{{/if}}
 })
 
 fun main(args: Array<String>) {
diff --git a/modules/jooby-cli/src/main/resources/cli/Controller.java.hbs b/modules/jooby-cli/src/main/resources/cli/Controller.java.hbs
@@ -0,0 +1,12 @@
+package {{package}};
+
+import io.jooby.annotations.*;
+
+@Path("/")
+public class Controller {
+
+  @GET
+  public String sayHi() {
+    return "Welcome to Jooby!";
+  }
+}
diff --git a/modules/jooby-cli/src/main/resources/cli/Controller.kt.hbs b/modules/jooby-cli/src/main/resources/cli/Controller.kt.hbs
@@ -0,0 +1,12 @@
+package {{package}}
+
+import io.jooby.annotations.*
+
+@Path("/")
+class Controller {
+
+  @GET
+  fun sayHi(): String {
+    return "Welcome to Jooby!"
+  }
+}
diff --git a/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs b/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs
@@ -18,6 +18,7 @@
     <jooby.version>{{joobyVersion}}</jooby.version>
 
     {{#if kotlin}}
+    <kotlin.version>1.3.41</kotlin.version>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     {{/if}}
     <maven.compiler.source>1.8</maven.compiler.source>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@ import io.jooby.Jooby;`
`5`	`5`	`public class App extends Jooby {`
`6`	`6`
`7`	`7`	`{`
	`8`	`+ {{#if mvc}}`
	`9`	`+ mvc(new Controller());`
	`10`	`+ {{else}}`
`8`	`11`	`get("/", ctx -> "Welcome to Jooby!");`
	`12`	`+ {{/if}}`
`9`	`13`	`}`
`10`	`14`
`11`	`15`	`public static void main(final String[] args) {`