Implement Eclipse Jetty core HTTP handler adapter #32097

gregw · 2024-01-24T06:08:57Z

This provides an implementation of a HTTP Handler Adaptor that is coded directly to the Eclipse Jetty core API, bypassing any servlet implementation.

Fixes #32035

pivotal-cla · 2024-01-24T06:09:53Z

@gregw Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

gregw · 2024-01-24T08:05:02Z

@pivotal-cla Working on getting a CCLA signed. Stand by....

gregw · 2024-01-31T13:04:06Z

.../main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java

+
+		@Override
+		public <T> T getNativeRequest() {
+			return null;


@lachlan-roberts this could be the ServerRequest passed into the builder?

gregw · 2024-02-01T01:42:02Z

@lachlan-roberts can you sign the individual CLA.

gregw · 2024-02-01T01:43:44Z

This PR is failing 2 tests that undertow also fails: See #25310.
Thus I'm currently suspecting bad tests or a spring bug, as both Jetty core and undertow are similar fully asynchronous integrations without servlets. We will investigate more, but any ideas that can help...

pivotal-cla · 2024-02-01T01:46:58Z

@gregw Thank you for signing the Contributor License Agreement!

gregw · 2024-02-01T02:00:07Z

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

+			// TODO: Why does intellij warn about possible blocking call?
+			//       Because it can block and we want to be fully asynchronous.  Use AsynchronousFileChannel
+			SeekableByteChannel channel = Files.newByteChannel(file, StandardOpenOption.READ);


Files.newByteChannel is a blocking operation, but I see that undertow also use it and just live with the warning. The chance of it actually blocking for any significant time is vanishingly small and there is no chance of dead lock.

gregw · 2024-02-01T02:32:03Z

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

+		// this.dataBuffer = dataBufferFactory.wrap(BufferUtil.copy(chunk.getByteBuffer())); // TODO this copy avoids multipart bugs
+		this.dataBuffer = dataBufferFactory.wrap(chunk.getByteBuffer()); // TODO avoid double slice?


This is the work around for the failing multipart tests (see #25310)

...g-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpRequest.java

…pResponse Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

…HttpResponse Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

framework-api/framework-api.gradle

…Adapter

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

…Adapter

gregw · 2024-03-22T10:26:05Z

@jhoeller Is there anything process wise that we need to do to move this PR on? It would be good to get some review to make sure we are on the right path.

gregw · 2024-04-04T12:25:30Z

@jhoeller @bclozel @sbrannen What can we do to move this PR on? I'm sure there is lots that we need to update, but we need review to know what that is.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

Update spring Jetty websocket usage

poutsma · 2024-04-16T14:09:59Z

@gregw Hi Greg, sorry for the recent lack of feedback. I plan to take a look at this PR soon, and hopefully we can merge it in 6.2 M2 or M3.

gregw mentioned this pull request Jan 24, 2024

Jetty core Handler that wraps Spring HttpHandler as an adaptor webtide/spring-framework#1

Closed

spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged or decided on label Jan 24, 2024

gregw commented Jan 31, 2024

View reviewed changes

gregw marked this pull request as ready for review February 1, 2024 01:52

gregw commented Feb 1, 2024

View reviewed changes

...g-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpRequest.java Outdated Show resolved Hide resolved

gregw commented Feb 1, 2024

View reviewed changes

...g-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpRequest.java Outdated Show resolved Hide resolved

gregw commented Feb 1, 2024

View reviewed changes

...g-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpRequest.java Outdated Show resolved Hide resolved

gregw mentioned this pull request Feb 1, 2024

ContentSourcePublisher throws from request jetty/jetty.project#11363

Closed

jhoeller added the in: web Issues in web modules (web, webmvc, webflux, websocket) label Feb 5, 2024

gregw and others added 14 commits February 6, 2024 10:25

Initial boiler plate implementation of JettyCore HttpHandler Adaptor

6ff974d

More implementation of the request side

db609a7

Created JettyCoreHttpServer

7a23fbf

Created JettyCoreHttpServer

418d699

WIP on tests

930d420

WIP on tests

eb38434

Cleanup start/stop for jetty

88e7467

retainable bytebuffer!

c5a327c

Non blocking invocation type

49abe72

split out into separate files

6ca453c

minor httpHeader optimizations

ea71c61

since updated with expected release

dd72a14

Initial implementation of the writeWith methods in JettyCoreServerHtt…

50e78d3

…pResponse Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

Implement the ZeroCopyHttpOutputMessage interface for JettyCoreServer…

ab844d6

…HttpResponse Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

lachlan-roberts and others added 5 commits February 12, 2024 17:17

Add a Jetty implementation of the spring WebSocketClient interface.

700f8e6

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

Prevent possible ReadPendingException from multiple demand.

1c7935e

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

Update the JettyWebSocketHandlerAdapter as a Session.Listener

bbd4e68

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

fixes for checkstyle

1f09a94

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

Ensure DataBuffer is processed correctly for BINARY messages.

08e9177

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

olamy mentioned this pull request Feb 12, 2024

Update spring Jetty websocket usage webtide/spring-framework#2

Merged

lachlan-roberts mentioned this pull request Feb 12, 2024

Uploading big multipart files via jetty 12.0.5 with spring boot 3.2.1 cause problems jetty/jetty.project#11310

Closed

lachlan-roberts added 2 commits February 13, 2024 13:06

Wait for close of Session before calling handlerCompletionSink

26cac28

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

fix checkstyle error

e2b452a

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

gregw marked this pull request as draft February 14, 2024 09:02

gregw commented Feb 14, 2024

View reviewed changes

framework-api/framework-api.gradle Outdated Show resolved Hide resolved

gregw and others added 7 commits February 20, 2024 10:03

Merge remote-tracking branch 'webtide/main' into JettyCoreHttpHandler…

b356adf

…Adapter

Changes from review.

a0f4fe2

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

Merge remote-tracking branch 'webtide/main' into JettyCoreHttpHandler…

0f88d7f

…Adapter

updated to jetty 12.0.7

65cf738

updated to jetty 12.0.7

6e25189

Merge remote-tracking branch 'webtide/main' into JettyCoreHttpHandler…

8f9d07c

…Adapter

updated to jetty 12.0.7

34429fe

gregw marked this pull request as ready for review March 7, 2024 15:53

gregw added 2 commits March 22, 2024 11:13

fixed checkstyle

5d5e46a

Merge branch 'main' into JettyCoreHttpHandlerAdapter

6187cdf

gregw and others added 4 commits April 4, 2024 14:26

Merge branch 'spring-projects:main' into JettyCoreHttpHandlerAdapter

d9202dc

Implement LifeCycle for JettyWebSocketClient

85505fe

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

additional changes from review

cd9063b

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

Merge pull request #2 from webtide/JettyCoreHttpHandlerAdapter-WebSocket

e9cb9a9

Update spring Jetty websocket usage

poutsma self-assigned this Apr 16, 2024

jhoeller mentioned this pull request Apr 18, 2024

Add an Eclipse Jetty Core HttpHandlerAdaptor #32035

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement Eclipse Jetty core HTTP handler adapter #32097

Implement Eclipse Jetty core HTTP handler adapter #32097

gregw commented Jan 24, 2024

pivotal-cla commented Jan 24, 2024

gregw commented Jan 24, 2024

gregw Jan 31, 2024

gregw commented Feb 1, 2024

gregw commented Feb 1, 2024

pivotal-cla commented Feb 1, 2024

gregw Feb 1, 2024

gregw Feb 1, 2024

gregw commented Mar 22, 2024

gregw commented Apr 4, 2024

poutsma commented Apr 16, 2024

		// this.dataBuffer = dataBufferFactory.wrap(BufferUtil.copy(chunk.getByteBuffer())); // TODO this copy avoids multipart bugs
		this.dataBuffer = dataBufferFactory.wrap(chunk.getByteBuffer()); // TODO avoid double slice?

Implement Eclipse Jetty core HTTP handler adapter #32097

Are you sure you want to change the base?

Implement Eclipse Jetty core HTTP handler adapter #32097

Conversation

gregw commented Jan 24, 2024

pivotal-cla commented Jan 24, 2024

gregw commented Jan 24, 2024

gregw Jan 31, 2024

Choose a reason for hiding this comment

gregw commented Feb 1, 2024

gregw commented Feb 1, 2024

pivotal-cla commented Feb 1, 2024

gregw Feb 1, 2024

Choose a reason for hiding this comment

gregw Feb 1, 2024

Choose a reason for hiding this comment

gregw commented Mar 22, 2024

gregw commented Apr 4, 2024

poutsma commented Apr 16, 2024