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....

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

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!

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

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>

gregw · 2024-06-12T00:26:00Z

@poutsma Our branches have diverged as I made the changes to use AbstractServerHttpRequest and AbstractServerHttpResponse in my branch and you forked before that. Let me see if I can rebase yours onto mine....

…ettyCoreHttpHandlerAdapter # Conflicts: # spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java # spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreHttpHandlerAdapter.java # spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpRequest.java # spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpResponse.java # spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java # spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java # spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java

…dapter

gregw · 2024-06-12T00:58:07Z

Actually, I'm not exactly sure why our branches were seen as divergent. I've merged yours back to mine and made sure that there are no differences, and also merged to lastest origin/main.
I'm not 100% sure the merge is correct, so we may want to proceed with your branch, but at least we can see your changes in this PR and I can work with it as well. Now looking at the test failure....

gregw · 2024-06-12T01:44:44Z

@poutsma

The only test that fails is the MultipartWebClientIntegrationTests. It does not fail in the IDE, making it a bit harder to reproduce. This is the server-side stack trace I get:
java.lang.IllegalArgumentException: demand pending
  ...
@gregw Does that ring any bell with you, or are we doing something wrong in the Spring code?

I think it is likely a problem with the jetty ContentSourcePublisher, for which we already have a PR in review: jetty/jetty.project#11849

The next Spring Framework milestone (6.2.0-M4) is on June 13th. I am not sure if we will have resolved the test above by that point, so this PR might not make that milestone. The milestone after that is scheduled for July 11th.

Agreed we are not making the 13th. We have a jetty release at the end of the month, so I will get #11849 merged for that and also look at change @rstoyanchev made.

@lachlan-roberts can you look at the websocket reviews before end of month, so that any changes needed in next jetty release can be included. E.g. anything needed to get the Container without the Handler

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

gregw · 2024-06-23T23:30:31Z

The MultipartWebClientIntegrationTests test did not fail running from command line with jetty 12.0.11-SNAPSHOT

poutsma · 2024-06-24T13:09:53Z

The MultipartWebClientIntegrationTests test did not fail running from command line with jetty 12.0.11-SNAPSHOT

Great! If I understand your other comment correctly, Jetty 12.0.11 will be out by the end of June, which should give us enough time to get this PR into 6.2.0-M5.

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

lachlan-roberts · 2024-07-01T06:24:04Z

@poutsma @rstoyanchev the build of this branch is now passing all tests with the staged release of jetty-12.0.11, which should be released very soon.

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

simonbasle · 2024-07-05T10:18:38Z

@lachlan-roberts @gregw I see the artifacts appear to be on Maven Central as of June 28, but I see no announcements and the release-tracking issue jetty/jetty.project/issues/11980 is not closed. Can you confirm if we should be waiting for anything before merging?

I've retrieved Arjen's branch locally, made a couple polishes (fixing duplicate start/stop methods in JettyWebSocketClient notably), rebased on the latest main and all the tests ran successfully 👍

gregw · 2024-07-05T10:49:37Z

@simonbasle The release is out in maven central and there is no taking it back. We have some people on vacation, hence the issue process has not yet completed.

simonbasle · 2024-07-05T13:54:32Z

@lachlan-roberts unless I've missed something, you haven't yet signed the CLA have you?

lachlan-roberts · 2024-07-05T15:07:39Z

@simonbasle yes I have already signed the CLA.

This provides an implementation of an HTTP Handler Adapter that is coded directly to the Eclipse Jetty core API, bypassing any servlet implementation. This includes a Jetty implementation of the spring `WebSocketClient` interface, `JettyWebSocketClient`, using an explicit dependency to the jetty-websocket-api. Closes spring-projectsgh-32097 Co-authored-by: Lachlan Roberts <lachlan@webtide.com> Co-authored-by: Arjen Poutsma <arjen.poutsma@broadcom.com>

See spring-projectsgh-32097

See gh-32097

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

.../main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java Outdated Show resolved Hide resolved

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

gregw commented Feb 1, 2024

View reviewed changes

...-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpResponse.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 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>

poutsma added this to the 6.2.0-M5 milestone Jun 11, 2024

gregw added 3 commits June 12, 2024 10:50

Merge remote-tracking branch 'origin/main' into JettyCoreHttpHandlerA…

8753907

…dapter

addExact

260da30

gregw and others added 2 commits June 12, 2024 12:07

doCommit not required

d415757

PR spring-projects#32097 - changes to address reviews for websocket

0b4b65f

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

gregw and others added 3 commits July 1, 2024 13:48

doCommit not required

5dd2538

fix checkstyle errors

6380d3a

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

fix failure for CookieIntegrationTests.partitionedAttributeTest

ca25b6c

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

poutsma pushed a commit to poutsma/spring-framework that referenced this pull request Jul 3, 2024

PR spring-projects#32097 - changes to address reviews for websocket

2bbd0c9

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

poutsma assigned simonbasle and unassigned poutsma Jul 3, 2024

simonbasle added a commit to simonbasle/spring-framework that referenced this pull request Jul 8, 2024

Polishing

de8f7cc

See spring-projectsgh-32097

simonbasle closed this in 0a60c62 Jul 8, 2024

simonbasle added a commit that referenced this pull request Jul 8, 2024

Polishing

8918a77

See gh-32097

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 commented Feb 1, 2024

gregw commented Feb 1, 2024

pivotal-cla commented Feb 1, 2024

gregw Feb 1, 2024

gregw commented Jun 12, 2024

gregw commented Jun 12, 2024

gregw commented Jun 12, 2024

gregw commented Jun 23, 2024

poutsma commented Jun 24, 2024

lachlan-roberts commented Jul 1, 2024

simonbasle commented Jul 5, 2024

gregw commented Jul 5, 2024

simonbasle commented Jul 5, 2024

lachlan-roberts commented Jul 5, 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

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 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 commented Jun 12, 2024

gregw commented Jun 12, 2024

gregw commented Jun 12, 2024

gregw commented Jun 23, 2024

poutsma commented Jun 24, 2024

lachlan-roberts commented Jul 1, 2024

simonbasle commented Jul 5, 2024

gregw commented Jul 5, 2024

simonbasle commented Jul 5, 2024

lachlan-roberts commented Jul 5, 2024