Skip to content

Commit f8529fb

Browse files
committed
moved DefaultWebSocketServerFactory into its own class (TooTallNate#138)
1 parent ef0e551 commit f8529fb

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package org.java_websocket.server;
2+
3+
import java.net.Socket;
4+
import java.nio.channels.SelectionKey;
5+
import java.nio.channels.SocketChannel;
6+
import java.util.List;
7+
8+
import org.java_websocket.WebSocketAdapter;
9+
import org.java_websocket.WebSocketImpl;
10+
import org.java_websocket.drafts.Draft;
11+
import org.java_websocket.server.WebSocketServer.WebSocketServerFactory;
12+
13+
public class DefaultWebSocketServerFactory implements WebSocketServerFactory {
14+
@Override
15+
public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket s ) {
16+
return new WebSocketImpl( a, d, s );
17+
}
18+
@Override
19+
public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s ) {
20+
return new WebSocketImpl( a, d, s );
21+
}
22+
@Override
23+
public SocketChannel wrapChannel( SelectionKey c ) {
24+
return (SocketChannel) c.channel();
25+
}
26+
}

src/main/java/org/java_websocket/server/WebSocketServer.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,7 @@ public abstract class WebSocketServer extends WebSocketAdapter implements Runnab
8080
private int queueinvokes = 0;
8181
private AtomicInteger queuesize = new AtomicInteger( 0 );
8282

83-
private WebSocketServerFactory wsf = new WebSocketServerFactory() {
84-
@Override
85-
public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket s ) {
86-
return new WebSocketImpl( a, d, s );
87-
}
88-
89-
@Override
90-
public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s ) {
91-
return new WebSocketImpl( a, d, s );
92-
}
93-
94-
@Override
95-
public SocketChannel wrapChannel( SelectionKey c ) {
96-
return (SocketChannel) c.channel();
97-
}
98-
};
83+
private WebSocketServerFactory wsf = new DefaultWebSocketServerFactory();
9984

10085
// CONSTRUCTORS ////////////////////////////////////////////////////////////
10186
/**

0 commit comments

Comments
 (0)