fix: server code generation

axelbdt · axelbdt · commit 46a039751bfd · 2023-07-28T19:39:56.000-04:00
diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/CreateCmd.java b/modules/jooby-cli/src/main/java/io/jooby/cli/CreateCmd.java
@@ -156,6 +156,9 @@ public void run(@NonNull CliContext ctx) throws Exception {
       finalArtifactId = name + "-" + version + (stork ? ".zip" : ".jar");
     }
 
+    String serverPackageName = serverPackageName(server);
+    String serverClassName = serverClassName(server);
+
     Map<String, Object> model = new HashMap<>();
     Map<String, String> dependencyMap = ctx.getDependencyMap();
     model.putAll(dependencyMap);
@@ -166,6 +169,8 @@ public void run(@NonNull CliContext ctx) throws Exception {
     model.put("version", version);
     model.put("joobyVersion", ctx.getVersion());
     model.put("server", server);
+    model.put("serverClassName", serverClassName);
+    model.put("serverPackageName", serverPackageName);
     model.put("kotlin", kotlin);
     model.put("dependencies", dependencies(dependencyMap, server, kotlin));
     model.put("testDependencies", testDependencies(dependencyMap, kotlin));
@@ -275,6 +280,32 @@ private String server(String value) {
     }
   }
 
+  private String serverPackageName(String server) {
+	  switch(server) {
+	  case "jetty":
+		  return "jetty";
+	  case "Netty":
+		  return "netty";
+	  case "utow":
+		  return "undertow";
+      default:
+        throw new IllegalArgumentException("Unknown server value: " + server);
+	  }
+  }
+  
+  private String serverClassName(String server) {
+	  switch(server) {
+	  case "jetty":
+		  return "JettyServer";
+	  case "Netty":
+		  return "NettyServer";
+	  case "utow":
+		  return "UndertowServer";
+      default:
+        throw new IllegalArgumentException("Unknown server value: " + server);
+	  }
+  }
+
   private void stork(CliContext ctx, Path projectDir) throws IOException {
     ctx.copyResource(
         "/cli/src/etc/stork/stork.yml",
diff --git a/modules/jooby-cli/src/main/resources/cli/App.java.hbs b/modules/jooby-cli/src/main/resources/cli/App.java.hbs
@@ -1,15 +1,15 @@
 package {{package}};
 
 import io.jooby.Jooby;
-import io.jooby.netty.NettyServer;
+import io.jooby.{{serverPackageName}}.{{serverClassName}};
 {{#if openapi}}
 import io.jooby.OpenAPIModule;
 {{/if}}
 
 public class App extends Jooby {
 
   {
-    install(new NettyServer());
+    install(new {{serverClassName}}());
   {{#if openapi}}
     install(new OpenAPIModule());
   {{/if}}
