kotlin: Mvc websocket fails to detect generic type fix jooby-project#951

jknack · jknack · commit 753323c31133 · 2018-01-02T18:14:55.000-03:00
diff --git a/jooby/src/main/java/org/jooby/internal/mvc/MvcWebSocket.java b/jooby/src/main/java/org/jooby/internal/mvc/MvcWebSocket.java
@@ -213,6 +213,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
+import java.util.function.Predicate;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class MvcWebSocket implements WebSocket.Handler<Mutant> {
@@ -223,7 +224,7 @@ public class MvcWebSocket implements WebSocket.Handler<Mutant> {
 
   MvcWebSocket(final WebSocket ws, final Class handler) {
     Injector injector = ws.require(Injector.class)
-      .createChildInjector(binder -> binder.bind(WebSocket.class).toInstance(ws));
+        .createChildInjector(binder -> binder.bind(WebSocket.class).toInstance(ws));
     this.handler = injector.getInstance(handler);
     this.messageType = TypeLiteral.get(messageType(handler));
   }
@@ -278,13 +279,17 @@ private boolean isError() {
 
   static Type messageType(final Class handler) {
     return Arrays.asList(handler.getGenericInterfaces())
-      .stream()
-      .filter(it -> TypeLiteral.get(it).getRawType().isAssignableFrom(WebSocket.OnMessage.class))
-      .findFirst()
-      .filter(ParameterizedType.class::isInstance)
-      .map(it -> ((ParameterizedType) it).getActualTypeArguments()[0])
-      .orElseThrow(() -> new IllegalArgumentException(
-        "Can't extract message type from: " + handler.getName()));
+        .stream()
+        .filter(rawTypeIs(WebSocket.Handler.class).or(rawTypeIs(WebSocket.OnMessage.class)))
+        .findFirst()
+        .filter(ParameterizedType.class::isInstance)
+        .map(it -> ((ParameterizedType) it).getActualTypeArguments()[0])
+        .orElseThrow(() -> new IllegalArgumentException(
+            "Can't extract message type from: " + handler.getName()));
+  }
+
+  private static Predicate<Type> rawTypeIs(Class<?> type) {
+    return it -> TypeLiteral.get(it).getRawType().isAssignableFrom(type);
   }
 
 }
diff --git a/modules/coverage-report/src/test/java/org/jooby/issues/Issue951.java b/modules/coverage-report/src/test/java/org/jooby/issues/Issue951.java
@@ -0,0 +1,114 @@
+package org.jooby.issues;
+
+import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.AsyncHttpClientConfig;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketTextListener;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
+import org.jooby.Request;
+import org.jooby.json.Jackson;
+import org.jooby.test.ServerFeature;
+import org.junit.After;
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.inject.Inject;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class Issue951 extends ServerFeature {
+
+  public static class User {
+    public String name;
+
+    @Override
+    public String toString() {
+      return name;
+    }
+  }
+
+  public static class MySocket implements org.jooby.WebSocket.Handler<User> {
+
+    private org.jooby.WebSocket ws;
+
+    @Inject
+    public MySocket(final org.jooby.WebSocket ws) {
+      this.ws = ws;
+    }
+
+    @Override
+    public void onMessage(final User message) throws Exception {
+      ws.send("=" + message);
+    }
+
+    @Override public void onOpen(Request req, org.jooby.WebSocket ws) throws Exception {
+
+    }
+
+    @Override public void onClose(org.jooby.WebSocket.CloseStatus status) throws Exception {
+
+    }
+
+    @Override public void onError(Throwable err) {
+
+    }
+  }
+
+  {
+    use(new Jackson());
+
+    ws("/951", MySocket.class)
+        .consumes("json");
+  }
+
+  private AsyncHttpClient client;
+
+  @Before
+  public void before() {
+    client = new AsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+  }
+
+  @After
+  public void after() {
+    client.close();
+  }
+
+  @Test
+  public void genericTypeOnHandlerObject() throws Exception {
+    LinkedList<String> messages = new LinkedList<>();
+
+    CountDownLatch latch = new CountDownLatch(1);
+
+    client.prepareGet(ws("951").toString())
+        .execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(
+            new WebSocketTextListener() {
+
+              @Override
+              public void onMessage(final String message) {
+                messages.add(message);
+                latch.countDown();
+              }
+
+              @Override
+              public void onOpen(final WebSocket websocket) {
+                websocket.sendMessage("{\"name\":\"pablo marmol\"}");
+              }
+
+              @Override
+              public void onClose(final WebSocket websocket) {
+              }
+
+              @Override
+              public void onError(final Throwable t) {
+              }
+            }).build())
+        .get();
+    if (latch.await(1L, TimeUnit.SECONDS)) {
+      assertEquals(Arrays.asList("=pablo marmol"), messages);
+    }
+  }
+
+}
