- remove redunancy of kt flag

jknack · jknack · commit bc9714cc9f8f · 2026-03-28T18:55:53.000-03:00
diff --git a/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java b/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java
@@ -164,7 +164,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
           try {
             context.add(router);
 
-            var sourceCode = router.toSourceCode(null);
+            var sourceCode = router.toSourceCode(router.isKt());
             var sourceLocation = router.getGeneratedFilename();
             var generatedType = router.getGeneratedType();
 
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/JsonRpcRouter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/JsonRpcRouter.java
@@ -85,13 +85,12 @@ private String getJsonRpcNamespace() {
   }
 
   @Override
-  public String toSourceCode(Boolean generateKotlin) throws IOException {
-    boolean kt = generateKotlin == Boolean.TRUE || isKt();
+  public String toSourceCode(boolean kt) throws IOException {
     var generateTypeName = getTargetType().getSimpleName().toString();
     var generatedClass = getGeneratedType().substring(getGeneratedType().lastIndexOf('.') + 1);
     var namespace = getJsonRpcNamespace();
 
-    var template = kt ? KOTLIN : JAVA;
+    var template = getTemplate(kt);
     var buffer = new StringBuilder();
 
     context.generateStaticImports(
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/McpRouter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/McpRouter.java
@@ -112,13 +112,12 @@ private String findTargetMethodName(String ref) {
   }
 
   @Override
-  public String toSourceCode(Boolean generateKotlin) throws IOException {
-    var kt = generateKotlin == Boolean.TRUE || isKt();
+  public String toSourceCode(boolean kt) throws IOException {
     var generateTypeName = getTargetType().getSimpleName().toString();
     var mcpClassName = getGeneratedType().substring(getGeneratedType().lastIndexOf('.') + 1);
     var packageName = getPackageName();
 
-    var template = kt ? KOTLIN : JAVA;
+    var template = getTemplate(kt);
     var buffer = new StringBuilder();
 
     context.generateStaticImports(
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/RestRouter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/RestRouter.java
@@ -71,12 +71,11 @@ public String getGeneratedType() {
   }
 
   @Override
-  public String toSourceCode(Boolean generateKotlin) throws IOException {
-    boolean kt = generateKotlin == Boolean.TRUE || isKt();
+  public String toSourceCode(boolean kt) throws IOException {
     var generateTypeName = getTargetType().getSimpleName().toString();
     var generatedClass = getGeneratedType().substring(getGeneratedType().lastIndexOf('.') + 1);
 
-    var template = kt ? KOTLIN : JAVA;
+    var template = getTemplate(kt);
     var suspended = getRoutes().stream().filter(WebRoute::isSuspendFun).toList();
     var noSuspended = getRoutes().stream().filter(it -> !it.isSuspendFun()).toList();
     var buffer = new StringBuilder();
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/TrpcRouter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/TrpcRouter.java
@@ -77,12 +77,11 @@ public String getGeneratedType() {
   }
 
   @Override
-  public String toSourceCode(Boolean generateKotlin) throws IOException {
-    boolean kt = generateKotlin == Boolean.TRUE || isKt();
+  public String toSourceCode(boolean kt) throws IOException {
     var generateTypeName = getTargetType().getSimpleName().toString();
     var generatedClass = getGeneratedType().substring(getGeneratedType().lastIndexOf('.') + 1);
 
-    var template = kt ? KOTLIN : JAVA;
+    var template = getTemplate(kt);
     var buffer = new StringBuilder();
 
     context.generateStaticImports(
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/WebRouter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/WebRouter.java
@@ -36,7 +36,7 @@ public class ${generatedClassName} implements ${implements} {
           }
 
           public ${generatedClassName}(io.jooby.SneakyThrows.Supplier<${className}> provider) {
-            setup(ctx -> (${className}) provider.get());
+            setup(ctx -> provider.get());
           }
 
           public ${generatedClassName}(io.jooby.SneakyThrows.Function<Class<${className}>, ${className}> provider) {
@@ -87,7 +87,7 @@ public WebRouter(MvcContext context, TypeElement clazz) {
 
   public abstract String getGeneratedType();
 
-  public abstract String toSourceCode(Boolean generateKotlin) throws IOException;
+  public abstract String toSourceCode(boolean kt) throws IOException;
 
   public String getGeneratedFilename() {
     return getGeneratedType().replace('.', '/') + (isKt() ? ".kt" : ".java");
@@ -128,6 +128,10 @@ public boolean hasBeanValidation() {
     return getRoutes().stream().anyMatch(WebRoute::hasBeanValidation);
   }
 
+  public String getTemplate(boolean kt) {
+    return kt ? KOTLIN : JAVA;
+  }
+
   protected StringBuilder trimr(StringBuilder buffer) {
     var i = buffer.length() - 1;
     while (i > 0 && Character.isWhitespace(buffer.charAt(i))) {
diff --git a/modules/jooby-apt/src/test/java/tests/i3830/ExampleServerMcp_.java b/modules/jooby-apt/src/test/java/tests/i3830/ExampleServerMcp_.java
diff --git a/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java b/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java
