Fix jooby-project#1843 by generating valid type name for arrays.

imeszaros · imeszaros · commit 51a40d37c3f8 · 2020-07-21T18:25:52.000+02:00
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/TypeDefinition.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/TypeDefinition.java
@@ -163,16 +163,22 @@ private org.objectweb.asm.Type asmType(String type) {
         return CHAR_TYPE;
       case "char[]":
         return org.objectweb.asm.Type.getType(char[].class);
-      case "String":
+      case "java.lang.String":
         return org.objectweb.asm.Type.getType(String.class);
-      case "String[]":
+      case "java.lang.String[]":
         return org.objectweb.asm.Type.getType(String[].class);
       default:
-        String prefix = "";
-        if (type.endsWith("[]")) {
-          prefix = "[";
+        StringBuilder prefix = new StringBuilder();
+        String postfix = "";
+        while (type.endsWith("[]")) {
+          prefix.append("[");
+          type = type.substring(0, type.length() - 2);
         }
-        return getObjectType(prefix + type.replace(".", "/"));
+        if (prefix.length() > 0) {
+          prefix.append("L");
+          postfix = ";";
+        }
+        return getObjectType(prefix + type.replace(".", "/") + postfix);
     }
   }
 
diff --git a/modules/jooby-apt/src/test/java/source/ArrayRoute.java b/modules/jooby-apt/src/test/java/source/ArrayRoute.java
@@ -0,0 +1,21 @@
+package source;
+
+import io.jooby.annotations.GET;
+
+public class ArrayRoute {
+
+  @GET("/mypath")
+  public String[] controllerMethodStrings() {
+    return new String[] { "/mypath1", "/mypath2" };
+  }
+
+  @GET("/mybeans")
+  public Bean[] controllerMethodBeans() {
+    return new Bean[] { new Bean(1), new Bean(2) };
+  }
+
+  @GET("/mymultibeans")
+  public Bean[][] controllerMethodMultiBeans() {
+    return new Bean[][] { { new Bean(1) }, { new Bean(2) } };
+  }
+}
diff --git a/modules/jooby-apt/src/test/java/source/Bean.java b/modules/jooby-apt/src/test/java/source/Bean.java
@@ -0,0 +1,24 @@
+package source;
+
+import java.util.Objects;
+
+public class Bean {
+  private final int id;
+
+  public Bean(int id) {
+    this.id = id;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Bean bean = (Bean) o;
+    return id == bean.id;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id);
+  }
+}
diff --git a/modules/jooby-apt/src/test/java/tests/ModuleCompilerTest.java b/modules/jooby-apt/src/test/java/tests/ModuleCompilerTest.java
@@ -6,6 +6,8 @@
 import io.jooby.StatusCode;
 import io.jooby.apt.MvcModuleCompilerRunner;
 import org.junit.jupiter.api.Test;
+import source.ArrayRoute;
+import source.Bean;
 import source.GetPostRoute;
 import source.JavaBeanParam;
 import source.MinRoute;
@@ -21,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -35,6 +38,26 @@ public void minRoute() throws Exception {
         });
   }
 
+  @Test
+  public void arrayRoute() throws Exception {
+    new MvcModuleCompilerRunner(new ArrayRoute())
+        .module(app -> {
+          MockRouter router = new MockRouter(app);
+
+          Object value = router.get("/mypath").value();
+          assertTrue(value instanceof String[]);
+          assertArrayEquals(new String[] { "/mypath1", "/mypath2" }, (String[]) value);
+
+          value = router.get("/mybeans").value();
+          assertTrue(value instanceof Bean[]);
+          assertArrayEquals(new Bean[] { new Bean(1), new Bean(2) }, (Bean[]) value);
+
+          value = router.get("/mymultibeans").value();
+          assertTrue(value instanceof Bean[][]);
+          assertArrayEquals(new Bean[][] { { new Bean(1) }, { new Bean(2) } }, (Bean[][]) value);
+        });
+  }
+
   @Test
   public void routes() throws Exception {
     new MvcModuleCompilerRunner(new Routes())
