Commit Graph

86 Commits

Author SHA1 Message Date
Lachlan 33c9536d12
Merge pull request #7058 from eclipse/jetty-10.0.x-2504-WebSocketDump
Issue #2504 - expose more WebSocket details in jetty server dump
2021-12-02 19:55:50 +11:00
Lachlan Roberts 370db7ad34 Demand even if no message sink in JavaxWebSocketFrameHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-11-08 21:28:10 +11:00
Lachlan Roberts bd7f1b114e Issue #2504 - expose more WebSocket details in jetty server dump
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-10-29 14:26:38 +11:00
Simone Bordet 0412bdc3d9 Fixes #6938 - module-info.java file do not use the canonical order for the elements
Changed order of entries in module-info.java to be canonical

(cherry picked from commit 02691171d5)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-10-01 09:25:55 +02:00
Lachlan Roberts bd396f867b Fix some more unstable tests.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-19 20:43:13 +10:00
Lachlan Roberts 026261f482 Issue #6566 - use counter in BufferCallbackAccumulator, fix InputStreamMessageSinkTest failures
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 17:10:12 +10:00
Lachlan Roberts 5236e47c42 Issue #6566 - utilise the demand interface in the websocket MessageSinks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 11:04:14 +10:00
Lachlan Roberts 646707b85c Issue #6602 - do not invoke SessionListener onOpen if session has been closed in OnOpen
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-12 15:50:25 +10:00
Lachlan Roberts 316c46675e Fix WebSocketComponents LifeCycle in AbstractJavaxWebSocketFrameHandlerTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 16:19:34 +10:00
Lachlan Roberts de8cbcf588 Fix broken tests using WebSocketComponents
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 15:11:35 +10:00
Lachlan Roberts a0cca858a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6106-WebSocketCDI 2021-04-27 16:15:52 +10:00
Lachlan Roberts ce8ede5c71 Use correct logger in AvailableEncoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-27 10:38:42 +10:00
Lachlan Roberts 5b13006a59 Make AvailableEncoders & AvailableDecoders implement Closable.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 21:46:28 +10:00
Lachlan Roberts ab08d1a1c6 Ensure that javax.websocket Encoder/Decoder destroy method is called.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-20 11:11:05 +10:00
Lachlan Roberts 0d84f35b0d Issue #6106 - Decorate javax.websocket components during the websocket upgrade.
Decoration should not be delayed until onOpen it should be during the call to
the WebSocketUpgradeFilter or WebSocketServlet.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-07 16:43:10 +10:00
Lachlan Roberts 02ef27246c Fix broken websocket tests.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 23:18:41 +10:00
Lachlan Roberts a1e522755b Issue #6106 - Decorate javax.websocket Encoder & Decoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 16:09:15 +10:00
Lachlan Roberts ac5eb54e1e Issue #6106 - fix WebSocket/CDI integration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-31 18:49:31 +11:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Lachlan Roberts 2d43661fe3 Set the javax ws upgrade request in constructor.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:47:35 +11:00
Lachlan Roberts 69facceec3 Issue #5850 - set the UpgradeRequest in the Javax FrameHandlerFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 16:11:28 +11:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
Lachlan 121d898517
Move websocket-util classes into websocket-core (#5705)
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util

* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167)
* Issue #4996 Regularize logging

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02:00
Lachlan Roberts 931e10458a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-19 08:34:39 +10:00
Lachlan 1e7ce3ac1e
Merge pull request #5101 from eclipse/jetty-10.0.x-5044-WebSocketUpgradeRequestResponse
Issue #5044 - Refactor of Jetty WebSocket Upgrade Request/Response
2020-08-06 09:11:12 +10:00
Lachlan Roberts fd5c07eceb removed dangling javadoc comment
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 08:25:40 +10:00
Simone Bordet c49035570e Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'. 2020-08-04 16:32:55 +02:00
Lachlan Roberts dbeac5eb49 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-04 20:37:12 +10:00
Simone Bordet 089e51f0bc Fixes #5083 - Convert synchronized usages to AutoLock.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-29 15:34:01 +02:00
Lachlan Roberts 1be0220988 Issue #4919 - make the SessionTracker the one to implement Graceful shutdown
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-28 17:38:41 +10:00
Lachlan Roberts 9e383f0891 Issue #4919 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-28 16:48:49 +10:00
Simone Bordet 8d69fc41a7 Fixes #5083 - Convert synchronized usages to AutoLock.
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
Lachlan Roberts e13d26ab45 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-24 13:39:07 +10:00
Lachlan Roberts 5726fa9364 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 10:19:53 +10:00
Lachlan Roberts 695d239ac5 Issue #4919 - all websocket containers to implement Graceful shutdown interface
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 00:09:43 +10:00
Lachlan Roberts c94e82470d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop 2020-07-17 15:32:10 +10:00
Lachlan Roberts 0a30525653 Issue #5043 - allow WebSocketListener / Endpoint anonymous classes to be used
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 12:44:54 +10:00
Lachlan Roberts 32b29a3ced fix DecoderListsTest and cleanup code
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-30 11:18:36 +10:00
Lachlan Roberts 4fdf52bd55 Issue #3428 - changes to AbstractDecodedMessageSink signature from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 20:34:18 +10:00
Lachlan Roberts acf47624a3 Issue #3428 - make AvailableDecoders only allow registration through EndpointConfig
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 19:01:00 +10:00
Lachlan Roberts eb01603abb Issue #3428 - improve testing and ensure decoders are registered in correct order
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 18:41:54 +10:00
Lachlan Roberts 5da4d7e460 Issue #3428 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 15:37:47 +10:00
Lachlan Roberts bebe6fd138 Issue #4919 - always stop SessionTracker before closing connections
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-02 15:37:55 +10:00
Lachlan Roberts 2c1c25d5a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3428-decoderLists 2020-05-28 10:29:53 +10:00
Lachlan Roberts 1690f69f36 Issue #3428 - improve testing & warn if no decoder accepts message
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-28 10:21:28 +10:00
Lachlan Roberts 9475662451 Issue #3428 - add validation checks when adding decoders
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-21 18:44:46 +10:00
Lachlan Roberts 43e3cdc4e3 Issue #3428 - cleanups and simplify MessageHandler registration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-21 14:58:46 +10:00
Lachlan Roberts 8e554c7d13 Issue #3428 - fix decoder list matching to get test working
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-21 08:52:01 +10:00
Lachlan Roberts 4b19c19815 Issue #3428 - Initial refactor to support javax websocket decoderLists
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-19 22:45:37 +10:00