Rename WebSocketListener to WebSocketConfigurer

jknack · jknack · commit 93e971e6c02f · 2019-09-25T09:16:09.000-03:00
diff --git a/jooby/src/main/java/io/jooby/WebSocket.java b/jooby/src/main/java/io/jooby/WebSocket.java
@@ -5,7 +5,7 @@
 
 public interface WebSocket {
   interface Handler {
-    void init(Context ctx, WebSocketListener initializer);
+    void init(Context ctx, WebSocketConfigurer configurer);
   }
 
   interface OnConnect {
diff --git a/jooby/src/main/java/io/jooby/WebSocketConfigurer.java b/jooby/src/main/java/io/jooby/WebSocketConfigurer.java
@@ -0,0 +1,12 @@
+package io.jooby;
+
+public interface WebSocketConfigurer {
+
+  WebSocketConfigurer onConnect(WebSocket.OnConnect callback);
+
+  WebSocketConfigurer onMessage(WebSocket.OnMessage callback);
+
+  WebSocketConfigurer onError(WebSocket.OnError callback);
+
+  WebSocketConfigurer onClose(WebSocket.OnClose callback);
+}
diff --git a/jooby/src/main/java/io/jooby/WebSocketListener.java b/jooby/src/main/java/io/jooby/WebSocketListener.java
diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java
@@ -6,7 +6,7 @@
 import io.jooby.SneakyThrows;
 import io.jooby.WebSocket;
 import io.jooby.WebSocketCloseStatus;
-import io.jooby.WebSocketListener;
+import io.jooby.WebSocketConfigurer;
 import io.jooby.WebSocketMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -23,7 +23,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-public class NettyWebSocket implements WebSocketListener, WebSocket {
+public class NettyWebSocket implements WebSocketConfigurer, WebSocket {
   /** All connected websocket. */
   private static final ConcurrentMap<String, List<WebSocket>> all = new ConcurrentHashMap<>();
 
@@ -92,22 +92,22 @@ public boolean isOpen() {
     return netty.ctx.channel().isOpen();
   }
 
-  @Override public WebSocketListener onConnect(WebSocket.OnConnect callback) {
+  @Override public WebSocketConfigurer onConnect(WebSocket.OnConnect callback) {
     connectCallback = callback;
     return this;
   }
 
-  @Override public WebSocketListener onMessage(WebSocket.OnMessage callback) {
+  @Override public WebSocketConfigurer onMessage(WebSocket.OnMessage callback) {
     messageCallback = callback;
     return this;
   }
 
-  @Override public WebSocketListener onClose(WebSocket.OnClose callback) {
+  @Override public WebSocketConfigurer onClose(WebSocket.OnClose callback) {
     onCloseCallback = callback;
     return this;
   }
 
-  @Override public WebSocketListener onError(OnError callback) {
+  @Override public WebSocketConfigurer onError(OnError callback) {
     onErrorCallback = callback;
     return this;
   }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`public interface WebSocket {`
`7`	`7`	`interface Handler {`
`8`		`- void init(Context ctx, WebSocketListener initializer);`
	`8`	`+ void init(Context ctx, WebSocketConfigurer configurer);`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`interface OnConnect {`