428474 - Expose batch mode in the Jetty WebSocket API

2 files changed, 13 insertions, 0 deletions

diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java
index c2a81bd27d..bbf9655708 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java
@@ -129,6 +129,15 @@ public interface RemoteEndpoint
     BatchMode getBatchMode();
 
     /**
+     * Set the batch mode with which messages are sent.
+     * 
+     * @param mode
+     *            the batch mode to use
+     * @see #flush()
+     */
+    void setBatchMode(BatchMode mode);
+    
+    /**
      * Flushes messages that may have been batched by the implementation.
      * @throws IOException if the flush fails
      * @see #getBatchMode()
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java
index 25d1001e7b..111e3a9fa2 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java
@@ -24,6 +24,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.eclipse.jetty.websocket.api.BatchMode;
+
 /**
  * Tags a POJO as being a WebSocket class.
  */
@@ -40,4 +42,6 @@ public @interface WebSocket
     int maxIdleTime() default -2;
 
     int maxTextMessageSize() default -2;
+    
+    BatchMode batchMode() default BatchMode.AUTO;
 }