Skip to content

Commit 14197c9

Browse files
committed
完善 solon-server-jetty-jakarta 适配
1 parent def900d commit 14197c9

File tree

4 files changed

+3
-78
lines changed

4 files changed

+3
-78
lines changed

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.eclipse.jetty.websocket.api.UpgradeRequest;
2323
import org.eclipse.jetty.websocket.server.WebSocketUpgradeHandler;
2424
import org.noear.solon.boot.ServerLifecycle;
25-
import org.noear.solon.boot.jetty.websocket.WebSocketConfigurator;
25+
import org.noear.solon.boot.jetty.websocket.WebSocketConfiguratorImpl;
2626
import org.noear.solon.core.event.EventBus;
2727
import org.noear.solon.core.util.ClassUtil;
2828

@@ -77,7 +77,7 @@ protected void setup(String host, int port) throws IOException {
7777

7878

7979
if (enableWebSocket && ClassUtil.hasClass(() -> UpgradeRequest.class)) {
80-
WebSocketUpgradeHandler wsHandler = WebSocketUpgradeHandler.from(real, contextHandler, new WebSocketConfigurator());
80+
WebSocketUpgradeHandler wsHandler = WebSocketUpgradeHandler.from(real, contextHandler, new WebSocketConfiguratorImpl());
8181
contextHandler.setHandler(wsHandler);
8282
}
8383

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/websocket/CallbackImpl.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/websocket/WebSocketConfigurator.java renamed to solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/websocket/WebSocketConfiguratorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @author noear
2626
* @since 3.5
2727
*/
28-
public class WebSocketConfigurator implements Consumer<ServerWebSocketContainer> {
28+
public class WebSocketConfiguratorImpl implements Consumer<ServerWebSocketContainer> {
2929

3030
@Override
3131
public void accept(ServerWebSocketContainer serverWebSocketContainer) {

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/websocket/WebSocketHandlerImpl.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)