Implement Eclipse Jetty core HTTP handler adapter

build.gradle

@@ -22,6 +22,7 @@ configure(allprojects) { project ->
 	apply plugin: "org.springframework.build.localdev"
 	group = "org.springframework"
 	repositories {
+		mavenLocal()
 		mavenCentral()
 		maven {
 			url "https://repo.spring.io/milestone"

framework-api/framework-api.gradle

@@ -8,6 +8,7 @@ description = "Spring Framework API Docs"
 apply from: "${rootDir}/gradle/publications.gradle"
 
 repositories {
+	mavenLocal()
 	maven {
 		url "https://repo.spring.io/release"
 	}

framework-platform/framework-platform.gradle

@@ -6,6 +6,10 @@ javaPlatform {
 	allowDependencies()
 }
 
+repositories {
+	mavenLocal()
+}
+
 dependencies {
 	api(platform("com.fasterxml.jackson:jackson-bom:2.15.3"))
 	api(platform("io.micrometer:micrometer-bom:1.12.2"))
@@ -14,10 +18,10 @@ dependencies {
 	api(platform("io.projectreactor:reactor-bom:2023.0.2"))
 	api(platform("io.rsocket:rsocket-bom:1.1.3"))
 	api(platform("org.apache.groovy:groovy-bom:4.0.17"))
-	api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
+	api(platform("org.apache.logging.log4j:log4j-bom:2.22.1"))
 	api(platform("org.assertj:assertj-bom:3.25.2"))
-	api(platform("org.eclipse.jetty:jetty-bom:12.0.5"))
-	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.5"))
+	api(platform("org.eclipse.jetty:jetty-bom:12.0.7-SNAPSHOT"))
+	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.7-SNAPSHOT"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"))
 	api(platform("org.junit:junit-bom:5.10.2"))

spring-jcl/spring-jcl.gradle

@@ -3,4 +3,6 @@ description = "Spring Commons Logging Bridge"
 dependencies {
 	optional("org.apache.logging.log4j:log4j-api")
 	optional("org.slf4j:slf4j-api")
+	optional("biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1")
+	optional("org.osgi:osgi.annotation:8.1.0")
 }

spring-web/spring-web.gradle

@@ -70,6 +70,7 @@ dependencies {
 		because("needed by Netty's SelfSignedCertificate on JDK 15+")
 	}
 	testFixturesImplementation("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server")
+	testFixturesImplementation("org.eclipse.jetty.websocket:jetty-websocket-jetty-server")
 	testImplementation(project(":spring-core-test"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-context")))

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java

@@ -42,7 +42,7 @@
  */
 public abstract class AbstractServerHttpRequest implements ServerHttpRequest {
 
-	private static final Pattern QUERY_PATTERN = Pattern.compile("([^&=]+)(=?)([^&]+)?");
+	static final Pattern QUERY_PATTERN = Pattern.compile("([^&=]+)(=?)([^&]+)?");
 
 
 	private final URI uri;
@@ -203,13 +203,6 @@ public SslInfo getSslInfo() {
 	@Nullable
 	protected abstract SslInfo initSslInfo();
 
-	/**
-	 * Return the underlying server response.
-	 * <p><strong>Note:</strong> This is exposed mainly for internal framework
-	 * use such as WebSocket upgrades in the spring-webflux module.
-	 */
-	public abstract <T> T getNativeRequest();
-
 	/**
 	 * For internal use in logging at the HTTP adapter layer.
 	 * @since 5.1

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java

@@ -155,14 +155,6 @@ public void addCookie(ResponseCookie cookie) {
 		}
 	}
 
-	/**
-	 * Return the underlying server response.
-	 * <p><strong>Note:</strong> This is exposed mainly for internal framework
-	 * use such as WebSocket upgrades in the spring-webflux module.
-	 */
-	public abstract <T> T getNativeResponse();
-
-
 	@Override
 	public void beforeCommit(Supplier<? extends Mono<Void>> action) {
 		this.commitActions.add(action);

spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java

@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import reactor.core.publisher.Flux;
@@ -67,14 +68,29 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
 
 
 	public DefaultServerHttpRequestBuilder(ServerHttpRequest original) {
-		Assert.notNull(original, "ServerHttpRequest is required");
-
-		this.uri = original.getURI();
-		this.headers = HttpHeaders.writableHttpHeaders(original.getHeaders());
-		this.httpMethod = original.getMethod();
-		this.contextPath = original.getPath().contextPath().value();
-		this.remoteAddress = original.getRemoteAddress();
-		this.body = original.getBody();
+		this(original.getURI(),
+				HttpHeaders.writableHttpHeaders(original.getHeaders()),
+				original.getMethod(),original.getPath().contextPath().value(),
+				original.getRemoteAddress(),
+				original.getBody(),
+				Objects.requireNonNull(original, "ServerHttpRequest is required"));
+	}
+
+
+	public DefaultServerHttpRequestBuilder(
+			URI uri,
+			HttpHeaders httpHeaders,
+			HttpMethod method,
+			String contextPath,
+			@Nullable InetSocketAddress remoteAddress,
+			Flux<DataBuffer> body,
+			ServerHttpRequest original) {
+		this.uri = uri;
+		this.headers = httpHeaders;
+		this.httpMethod = method;
+		this.contextPath = contextPath;
+		this.remoteAddress = remoteAddress;
+		this.body = body;
 		this.originalRequest = original;
 	}
 

spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreHttpHandlerAdapter.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2002-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.http.server.reactive;
+
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.Callback;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+
+/**
+ * Adapt {@link HttpHandler} to the Jetty {@link org.eclipse.jetty.server.Handler} abstraction.
+ *
+ * @author Greg Wilkins
+ * @author Lachlan Roberts
+ * @since 6.2
+ */
+public class JettyCoreHttpHandlerAdapter extends Handler.Abstract.NonBlocking {
+
+	private final HttpHandler httpHandler;
+
+	private final DataBufferFactory dataBufferFactory;
+
+	public JettyCoreHttpHandlerAdapter(HttpHandler httpHandler) {
+		this.httpHandler = httpHandler;
+
+		// Currently we do not make a DataBufferFactory over the servers ByteBufferPool,
+		// because we mainly use wrap and there should be few allocation done by the factory.
+		// But it could be possible to use the servers buffer pool for allocations and to
+		// create PooledDataBuffers
+		this.dataBufferFactory = new DefaultDataBufferFactory();
+	}
+
+	@Override
+	public boolean handle(Request request, Response response, Callback callback) throws Exception {
+		this.httpHandler.handle(new JettyCoreServerHttpRequest(this.dataBufferFactory, request), new JettyCoreServerHttpResponse(response))
+				.subscribe(new Subscriber<>() {
+					@Override
+					public void onSubscribe(Subscription s) {
+						s.request(Long.MAX_VALUE);
+					}
+
+					@Override
+					public void onNext(Void unused) {
+						// we can ignore the void as we only seek onError or onComplete
+					}
+
+					@Override
+					public void onError(Throwable t) {
+						callback.failed(t);
+					}
+
+					@Override
+					public void onComplete() {
+						callback.succeeded();
+					}
+				});
+		return true;
+	}
+
+}