diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index a2e43d0bb37..67b2f167f5c 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -95,7 +95,7 @@ dependencies { api("org.apache.derby:derbyclient:10.16.1.1") api("org.apache.derby:derbytools:10.16.1.1") api("org.apache.httpcomponents.client5:httpclient5:5.5") - api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.4") + api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.5") api("org.apache.poi:poi-ooxml:5.2.5") api("org.apache.tomcat.embed:tomcat-embed-core:11.0.7") api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.7") diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java index 9fa9c6b70a2..cf482a3caec 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java @@ -117,7 +117,6 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener { private final Callback callback; - public JettyCallbackDataBuffer(DataBuffer delegate, Callback callback) { Assert.notNull(delegate, "'delegate` must not be null"); Assert.notNull(callback, "Callback must not be null"); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java index ec366d8f663..33e8d9cefcf 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java @@ -66,6 +66,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { private final Sinks.@Nullable Empty handlerCompletionSink; + public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) { this(session, info, factory, null); } @@ -105,6 +106,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { }); } + void handleMessage(WebSocketMessage message) { Assert.state(this.sink != null, "No sink available"); this.sink.next(message); @@ -187,7 +189,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } protected Mono sendMessage(WebSocketMessage message) { - Callback.Completable completable = new Callback.Completable(); DataBuffer dataBuffer = message.getPayload(); Session session = getDelegate(); @@ -243,4 +244,5 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } return Mono.fromFuture(completable); } + } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java index 3183d349ed1..628404f3f74 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java @@ -165,7 +165,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { return getNativeSession().isOpen(); } - @Override public void initializeNativeSession(Session session) { super.initializeNativeSession(session); @@ -199,7 +198,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { return Collections.emptyList(); } - @Override protected void sendTextMessage(TextMessage message) throws IOException { useSession((session, callback) -> session.sendText(message.getPayload(), callback)); @@ -233,7 +231,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } catch (ExecutionException ex) { Throwable cause = ex.getCause(); - if (cause instanceof IOException ioEx) { throw ioEx; } @@ -249,6 +246,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } } + @FunctionalInterface private interface SessionConsumer {