Add binary‑message support to WebSocketMessage API

- fix #3825

Author: jknack

jooby/src/main/java/io/jooby/WebSocketMessage.java

@@ -6,6 +6,7 @@
 package io.jooby;
 
 import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -27,7 +28,21 @@ public interface WebSocketMessage extends Value {
    * @param <T> Element type.
    * @return Instance of the type.
    */
-  @NonNull <T> T to(@NonNull Type type);
+  <T> T to(@NonNull Type type);
+
+  /**
+   * Direct access to bytes.
+   *
+   * @return Direct access to bytes.
+   */
+  byte[] bytes();
+
+  /**
+   * Direct access to bytes.
+   *
+   * @return Direct access to bytes.
+   */
+  ByteBuffer byteBuffer();
 
   /**
    * Creates a websocket message.
@@ -36,7 +51,7 @@ public interface WebSocketMessage extends Value {
    * @param bytes Text message as byte array.
    * @return A websocket message.
    */
-  static @NonNull WebSocketMessage create(@NonNull Context ctx, @NonNull byte[] bytes) {
+  static WebSocketMessage create(@NonNull Context ctx, @NonNull byte[] bytes) {
     return new WebSocketMessageImpl(ctx, bytes);
   }
 
@@ -47,7 +62,7 @@ public interface WebSocketMessage extends Value {
    * @param message Text message.
    * @return A websocket message.
    */
-  static @NonNull WebSocketMessage create(@NonNull Context ctx, @NonNull String message) {
+  static WebSocketMessage create(@NonNull Context ctx, @NonNull String message) {
     return new WebSocketMessageImpl(ctx, message.getBytes(StandardCharsets.UTF_8));
   }
 }

jooby/src/main/java/io/jooby/internal/WebSocketMessageImpl.java

@@ -6,6 +6,7 @@
 package io.jooby.internal;
 
 import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -73,4 +74,14 @@ public Value getOrDefault(@NonNull String name, @NonNull String defaultValue) {
   public <T> T toNullable(@NonNull Type type) {
     return this.to(type);
   }
+
+  @Override
+  @NonNull public byte[] bytes() {
+    return super.bytes();
+  }
+
+  @Override
+  public @NonNull ByteBuffer byteBuffer() {
+    return ByteBuffer.wrap(bytes());
+  }
 }

tests/src/test/java/io/jooby/i3825/Issue3825.java

@@ -0,0 +1,45 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.i3825;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.nio.charset.StandardCharsets;
+
+import io.jooby.junit.ServerTest;
+import io.jooby.junit.ServerTestRunner;
+
+public class Issue3825 {
+  @ServerTest
+  public void shouldHaveAccessToBytes(ServerTestRunner runner) {
+    runner
+        .define(
+            app -> {
+              app.ws(
+                  "/ws/3825",
+                  (ctx, initializer) -> {
+                    initializer.onMessage(
+                        (ws, message) -> {
+                          ws.send(
+                              ">bytes: "
+                                  + new String(message.bytes())
+                                  + "; "
+                                  + new String(message.byteBuffer().array()));
+                        });
+                  });
+            })
+        .ready(
+            client -> {
+              client.syncWebSocket(
+                  "/ws/3825",
+                  ws -> {
+                    assertEquals(
+                        ">bytes: bytes[]; bytes[]",
+                        ws.sendBytes("bytes[]".getBytes(StandardCharsets.UTF_8)));
+                  });
+            });
+  }
+}