Merge branch '6.2.x'

# Conflicts:
#	framework-platform/framework-platform.gradle

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")

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");

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

@@ -66,6 +66,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
 
 	private final Sinks.@Nullable Empty<Void> handlerCompletionSink;
 
+
 	public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) {
 		this(session, info, factory, null);
 	}
@@ -105,6 +106,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
 		});
 	}
 
+
 	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<Session> {
 	}
 
 	protected Mono<Void> 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<Session> {
 		}
 		return Mono.fromFuture(completable);
 	}
+
 }

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

@@ -165,7 +165,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
 		return getNativeSession().isOpen();
 	}
 
-
 	@Override
 	public void initializeNativeSession(Session session) {
 		super.initializeNativeSession(session);
@@ -199,7 +198,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
 		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<Session> {
 		}
 		catch (ExecutionException ex) {
 			Throwable cause = ex.getCause();
-
 			if (cause instanceof IOException ioEx) {
 				throw ioEx;
 			}
@@ -249,6 +246,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
 		}
 	}
 
+
 	@FunctionalInterface
 	private interface SessionConsumer {