jooby-apt generates incorrect import statement for bounded wildcards

jknack · jknack · commit 512e0e2805c4 · 2020-06-23T23:59:18.000-03:00
fix jooby-project#1814
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java
@@ -26,7 +26,6 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
-
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
@@ -68,7 +67,8 @@ public class HandlerCompiler {
   private Types typeUtils;
   private TypeMirror annotation;
 
-  public HandlerCompiler(ProcessingEnvironment environment, TypeElement owner, ExecutableElement executable,
+  public HandlerCompiler(ProcessingEnvironment environment, TypeElement owner,
+      ExecutableElement executable,
       TypeElement httpMethod, String pattern) {
     this.httpMethod = httpMethod.getSimpleName().toString().toLowerCase();
     this.annotation = httpMethod.asType();
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java
@@ -152,7 +152,7 @@ private void makeExtension(ClassWriter writer, String methodName) {
   private void install(ClassWriter writer, List<HandlerCompiler> handlers) throws Exception {
     MethodVisitor visitor = writer.visitMethod(ACC_PRIVATE | ACC_STATIC, "install",
         "(Lio/jooby/Jooby;Ljavax/inject/Provider;)V",
-        "(Lio/jooby/Jooby;Ljavax/inject/Provider<" + moduleDescriptorName + ">;)V",
+        "(Lio/jooby/Jooby;Ljavax/inject/Provider<" + controllerClass + ">;)V",
         new String[]{"java/lang/Exception"});
     visitor.visitParameter("app", 0);
     visitor.visitParameter("provider", 0);
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
@@ -40,12 +40,6 @@ public TypeDefinition(Types types, TypeMirror type) {
     this.type = type;
   }
 
-  public String getSimpleName() {
-    String name = getName();
-    int i = name.lastIndexOf('.');
-    return i > 0 ? name.substring(i + 1) : name;
-  }
-
   public String getName() {
     return getRawType().toString();
   }
@@ -122,7 +116,7 @@ public List<TypeDefinition> getArguments() {
   }
 
   public Type toJvmType() {
-    return asmType(getName(type));
+    return asmType(getName(typeUtils.erasure(type)));
   }
 
   public boolean isRawType() {
diff --git a/modules/jooby-apt/src/test/java/tests/i1814/C1814.java b/modules/jooby-apt/src/test/java/tests/i1814/C1814.java
@@ -0,0 +1,20 @@
+package tests.i1814;
+
+import io.jooby.Reified;
+import io.jooby.Route;
+import io.jooby.annotations.GET;
+import io.jooby.annotations.QueryParam;
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class C1814 {
+  @GET("/1814")
+  public List<? extends U1814> getUsers(@QueryParam @Nonnull String type, Route route) {
+    assertEquals(Reified.list(U1814.class).getType(), route.getReturnType());
+    return Collections.singletonList(new U1814(type));
+  }
+}
diff --git a/modules/jooby-apt/src/test/java/tests/i1814/Expected1814.java b/modules/jooby-apt/src/test/java/tests/i1814/Expected1814.java
@@ -0,0 +1,27 @@
+package tests.i1814;
+
+import io.jooby.Extension;
+import io.jooby.MvcFactory;
+import io.jooby.Route;
+
+import javax.annotation.Nonnull;
+import javax.inject.Provider;
+
+public class Expected1814 implements MvcFactory {
+
+  @Override public boolean supports(@Nonnull Class type) {
+    return false;
+  }
+
+  @Nonnull @Override public Extension create(@Nonnull Provider provider) {
+    return application -> {
+      Route route = application.get("/1814", ctx -> {
+        C1814 controller = (C1814) provider.get();
+        String type = ctx.query("type").value();
+        return controller.getUsers(type, ctx.getRoute());
+      });
+      route.setReturnType(U1814.class);
+    };
+  }
+
+}
diff --git a/modules/jooby-apt/src/test/java/tests/i1814/Issue1814.java b/modules/jooby-apt/src/test/java/tests/i1814/Issue1814.java
@@ -0,0 +1,24 @@
+package tests.i1814;
+
+import io.jooby.MockContext;
+import io.jooby.MockRouter;
+import io.jooby.apt.MvcModuleCompilerRunner;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue1814 {
+
+  @Test
+  public void shouldIgnoreWildcardResponseType() throws Exception {
+    new MvcModuleCompilerRunner(new C1814())
+        .example(Expected1814.class)
+        .module(app -> {
+          MockRouter router = new MockRouter(app);
+          MockContext ctx = new MockContext();
+          ctx.setQueryString("?type=foo");
+          assertEquals("[foo]", router.get("/1814", ctx).value().toString());
+        });
+  }
+
+}
diff --git a/modules/jooby-apt/src/test/java/tests/i1814/U1814.java b/modules/jooby-apt/src/test/java/tests/i1814/U1814.java
@@ -0,0 +1,13 @@
+package tests.i1814;
+
+public class U1814 {
+  private final String type;
+
+  public U1814(String type) {
+    this.type = type;
+  }
+
+  @Override public String toString() {
+    return type;
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,6 @@ public TypeDefinition(Types types, TypeMirror type) {`
`40`	`40`	`this.type = type;`
`41`	`41`	`}`
`42`	`42`
`43`		`- public String getSimpleName() {`
`44`		`- String name = getName();`
`45`		`- int i = name.lastIndexOf('.');`
`46`		`- return i > 0 ? name.substring(i + 1) : name;`
`47`		`- }`
`48`		`-`
`49`	`43`	`public String getName() {`
`50`	`44`	`return getRawType().toString();`
`51`	`45`	`}`
`@@ -122,7 +116,7 @@ public List<TypeDefinition> getArguments() {`
`122`	`116`	`}`
`123`	`117`
`124`	`118`	`public Type toJvmType() {`
`125`		`- return asmType(getName(type));`
	`119`	`+ return asmType(getName(typeUtils.erasure(type)));`
`126`	`120`	`}`
`127`	`121`
`128`	`122`	`public boolean isRawType() {`