Skip to content

Commit 11d4a67

Browse files
committed
Added a check for websockets and switched back to jetty as the default implementation for until the own implementation is fully stable.
1 parent 620c5da commit 11d4a67

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<groupId>org.eclipse.jetty</groupId>
5757
<artifactId>jetty-server</artifactId>
5858
<version>11.0.7</version>
59-
<optional>true</optional>
59+
<!-- <optional>true</optional> -->
6060
</dependency>
6161
<dependency>
6262
<groupId>org.reflections</groupId>

src/main/java/org/javawebstack/httpserver/HTTPServer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.javawebstack.abstractdata.AbstractMapper;
44
import org.javawebstack.abstractdata.NamingPolicy;
55
import org.javawebstack.httpserver.adapter.IHTTPSocketServer;
6+
import org.javawebstack.httpserver.adapter.jetty.JettyHTTPSocketServer;
67
import org.javawebstack.httpserver.adapter.simple.SimpleHTTPSocketServer;
78
import org.javawebstack.httpserver.handler.*;
89
import org.javawebstack.httpserver.router.DefaultRouteAutoInjector;
@@ -45,7 +46,7 @@ public class HTTPServer implements RouteParamTransformerProvider {
4546
private Function<Class<?>, Object> controllerInitiator = this::defaultControllerInitiator;
4647

4748
public HTTPServer() {
48-
this(new SimpleHTTPSocketServer());
49+
this(new JettyHTTPSocketServer());
4950
}
5051

5152
public HTTPServer(IHTTPSocketServer server) {
@@ -196,6 +197,8 @@ public HTTPServer afterAny(String pattern, AfterRequestHandler... handlers) {
196197
}
197198

198199
public HTTPServer webSocket(String pattern, WebSocketHandler handler) {
200+
if(!server.isWebSocketSupported())
201+
throw new UnsupportedOperationException(server.getClass().getName() + " does not support websockets!");
199202
return route(HTTPMethod.WEBSOCKET, pattern, new InternalWebSocketRequestHandler(handler));
200203
}
201204

src/main/java/org/javawebstack/httpserver/adapter/IHTTPSocketServer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ public interface IHTTPSocketServer {
1010
void stop();
1111
void join();
1212
void setHandler(IHTTPSocketHandler handler);
13+
boolean isWebSocketSupported();
1314

1415
}

src/main/java/org/javawebstack/httpserver/adapter/jetty/JettyHTTPSocketServer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,8 @@ public void setHandler(IHTTPSocketHandler handler) {
6666
this.handler = handler;
6767
}
6868

69+
public boolean isWebSocketSupported() {
70+
return false;
71+
}
72+
6973
}

src/main/java/org/javawebstack/httpserver/adapter/simple/SimpleHTTPSocketServer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,8 @@ public void stop() {
6060
} catch (IOException e) {}
6161
}
6262

63+
public boolean isWebSocketSupported() {
64+
return false;
65+
}
66+
6367
}

0 commit comments

Comments
 (0)