root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x' 

# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller 2025-09-09 18:48:30 +02:00
parent 39db0e0af2 275fb52ad6
commit 2c547e9051
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework-platform/framework-platform.gradle
View File

@ -95,7 +95,7 @@ dependencies {
api("org.apache.derby:derbyclient:10.16.1.1") api("org.apache.derby:derbyclient:10.16.1.1")
api("org.apache.derby:derbytools: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.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.poi:poi-ooxml:5.2.5")
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.7") api("org.apache.tomcat.embed:tomcat-embed-core:11.0.7")
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.7") api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.7")

1
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
View File

@ -117,7 +117,6 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener {
private final Callback callback; private final Callback callback;
public JettyCallbackDataBuffer(DataBuffer delegate, Callback callback) { public JettyCallbackDataBuffer(DataBuffer delegate, Callback callback) {
Assert.notNull(delegate, "'delegate` must not be null"); Assert.notNull(delegate, "'delegate` must not be null");
Assert.notNull(callback, "Callback must not be null"); Assert.notNull(callback, "Callback must not be null");

4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
View File

@ -66,6 +66,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
private final Sinks.@Nullable Empty<Void> handlerCompletionSink; private final Sinks.@Nullable Empty<Void> handlerCompletionSink;
public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) { public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) {
this(session, info, factory, null); this(session, info, factory, null);
} }
@ -105,6 +106,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
}); });
} }
void handleMessage(WebSocketMessage message) { void handleMessage(WebSocketMessage message) {
Assert.state(this.sink != null, "No sink available"); Assert.state(this.sink != null, "No sink available");
this.sink.next(message); this.sink.next(message);
@ -187,7 +189,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
protected Mono<Void> sendMessage(WebSocketMessage message) { protected Mono<Void> sendMessage(WebSocketMessage message) {
Callback.Completable completable = new Callback.Completable(); Callback.Completable completable = new Callback.Completable();
DataBuffer dataBuffer = message.getPayload(); DataBuffer dataBuffer = message.getPayload();
Session session = getDelegate(); Session session = getDelegate();
@ -243,4 +244,5 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
return Mono.fromFuture(completable); return Mono.fromFuture(completable);
} }
} }

4
spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
View File

@ -165,7 +165,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
return getNativeSession().isOpen(); return getNativeSession().isOpen();
} }
@Override @Override
public void initializeNativeSession(Session session) { public void initializeNativeSession(Session session) {
super.initializeNativeSession(session); super.initializeNativeSession(session);
@ -199,7 +198,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
return Collections.emptyList(); return Collections.emptyList();
} }
@Override @Override
protected void sendTextMessage(TextMessage message) throws IOException { protected void sendTextMessage(TextMessage message) throws IOException {
useSession((session, callback) -> session.sendText(message.getPayload(), callback)); useSession((session, callback) -> session.sendText(message.getPayload(), callback));
@ -233,7 +231,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
catch (ExecutionException ex) { catch (ExecutionException ex) {
Throwable cause = ex.getCause(); Throwable cause = ex.getCause();
if (cause instanceof IOException ioEx) { if (cause instanceof IOException ioEx) {
throw ioEx; throw ioEx;
} }
@ -249,6 +246,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
} }
@FunctionalInterface @FunctionalInterface
private interface SessionConsumer { private interface SessionConsumer {