jooby-apt: add option to remove mvcMethod and returnType from route

- fix  #3492

Author: jknack

jooby/src/main/java/io/jooby/Route.java

@@ -652,7 +652,7 @@ public boolean isNonBlockingSet() {
   }
 
   /**
-   * Return return type.
+   * Route return type.
    *
    * @return Return type.
    */

modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java

@@ -30,7 +30,15 @@
 
 import io.jooby.internal.apt.*;
 
-@SupportedOptions({HANDLER, DEBUG, INCREMENTAL, SERVICES, SKIP_ATTRIBUTE_ANNOTATIONS})
+@SupportedOptions({
+  HANDLER,
+  DEBUG,
+  INCREMENTAL,
+  SERVICES,
+  MVC_METHOD,
+  RETURN_TYPE,
+  SKIP_ATTRIBUTE_ANNOTATIONS
+})
 @SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class JoobyProcessor extends AbstractProcessor {
   public interface Options {
@@ -39,6 +47,8 @@ public interface Options {
     String ROUTER_PREFIX = "jooby.routerPrefix";
     String ROUTER_SUFFIX = "jooby.routerSuffix";
     String INCREMENTAL = "jooby.incremental";
+    String RETURN_TYPE = "jooby.returnType";
+    String MVC_METHOD = "jooby.mvcMethod";
     String SERVICES = "jooby.services";
     String SKIP_ATTRIBUTE_ANNOTATIONS = "jooby.skipAttributeAnnotations";
 
@@ -49,7 +59,9 @@ static boolean boolOpt(ProcessingEnvironment environment, String option, boolean
 
     static List<String> stringListOpt(ProcessingEnvironment environment, String option) {
       String value = string(environment, option, null);
-      return value == null || value.isEmpty() ? List.of() : List.of(value.split(","));
+      return value == null || value.isEmpty()
+          ? List.of()
+          : Stream.of(value.split(",")).filter(it -> !it.isBlank()).map(String::trim).toList();
     }
 
     static String string(ProcessingEnvironment environment, String option, String defaultValue) {
@@ -307,7 +319,7 @@ public Set<String> getSupportedOptions() {
       options.add(
           String.format(
               "org.gradle.annotation.processing.%s",
-              context.isServices() ? "aggregating" : "isolating"));
+              context.generateServices() ? "aggregating" : "isolating"));
     }
 
     return options;

modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcContext.java

@@ -32,13 +32,17 @@ private record ResultType(String type, String handler, boolean nonBlocking) {}
   private final String routerSuffix;
   private final Consumer<String> output;
   private final List<MvcRouter> routers = new ArrayList<>();
+  private final boolean returnType;
+  private final boolean mvcMethod;
   private final Map<TypeElement, ResultType> handler = new HashMap<>();
 
   public MvcContext(ProcessingEnvironment processingEnvironment, Consumer<String> output) {
     this.processingEnvironment = processingEnvironment;
     this.output = output;
     this.debug = Options.boolOpt(processingEnvironment, Options.DEBUG, false);
     this.incremental = Options.boolOpt(processingEnvironment, Options.INCREMENTAL, true);
+    this.returnType = Options.boolOpt(processingEnvironment, Options.RETURN_TYPE, true);
+    this.mvcMethod = Options.boolOpt(processingEnvironment, Options.MVC_METHOD, true);
     this.services = Options.boolOpt(processingEnvironment, Options.SERVICES, true);
     this.routerPrefix = Options.string(processingEnvironment, Options.ROUTER_PREFIX, "");
     this.routerSuffix = Options.string(processingEnvironment, Options.ROUTER_SUFFIX, "_");
@@ -240,12 +244,16 @@ public boolean generateServices() {
     return services;
   }
 
-  public boolean isIncremental() {
-    return incremental;
+  public boolean generateMvcMethod() {
+    return mvcMethod;
   }
 
-  public boolean isServices() {
-    return services;
+  public boolean generateReturnType() {
+    return returnType;
+  }
+
+  public boolean isIncremental() {
+    return incremental;
   }
 
   public void debug(String message, Object... args) {

modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcRoute.java

@@ -142,22 +142,33 @@ public List<String> generateMapping(boolean kt) {
             .toSourceCode(kt, this, 2)
             .ifPresent(
                 attributes -> block.add(statement(indent(2), ".setAttributes(", attributes, ")")));
-        /* returnType */
-        block.add(statement(indent(2), ".setReturnType(", returnType.toSourceCode(kt), ")"));
-        /* mvcMethod */
+        if (context.generateReturnType()) {
+          /* returnType */
+          block.add(statement(indent(2), ".setReturnType(", returnType.toSourceCode(kt), ")"));
+        }
         var lineSep = lastLine ? lineSeparator() : lineSeparator() + lineSeparator();
-        block.add(
-            CodeBlock.of(
-                indent(2),
-                ".setMvcMethod(",
-                router.getTargetType().getSimpleName(),
-                clazz(kt),
-                ".getMethod(",
-                string(getMethodName()),
-                paramString.isEmpty() ? "" : ", " + paramString,
-                "))",
-                semicolon(kt),
-                lineSep));
+        if (context.generateMvcMethod()) {
+          /* mvcMethod */
+          block.add(
+              CodeBlock.of(
+                  indent(2),
+                  ".setMvcMethod(",
+                  router.getTargetType().getSimpleName(),
+                  clazz(kt),
+                  ".getMethod(",
+                  string(getMethodName()),
+                  paramString.isEmpty() ? "" : ", " + paramString,
+                  "))",
+                  semicolon(kt),
+                  lineSep));
+        } else {
+          var lastStatement = block.get(block.size() - 1);
+          if (lastStatement.endsWith(lineSeparator())) {
+            lastStatement =
+                lastStatement.substring(0, lastStatement.length() - lineSeparator().length());
+          }
+          block.set(block.size() - 1, lastStatement + semicolon(kt) + lineSep);
+        }
       }
     }
     return block;