Commit Graph

27071 Commits

Author SHA1 Message Date
Lachlan 0e95953be3
Merge pull request #9043 from eclipse/jetty-12.0.x-httpcontentFactoryCleanup
Create StaticHttpContentFactory and other cleanups
2022-12-23 22:54:38 +11:00
Joakim Erdfelt 1f78c90d81
Revert noisy DEBUG logging 2022-12-21 22:28:42 -06:00
Joakim Erdfelt 4ccdf25446
Fix NPE on DEBUG logging 2022-12-21 22:28:19 -06:00
Greg Wilkins 040ed85ae9
Test for ee10 response commit (#9048)
* cleanups of ServletRequestState
* pass in context in constructor when creating the AsyncContextEvent

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-22 13:05:38 +11:00
Greg Wilkins 3d4bb492d0 Improved test coverage 2022-12-22 09:51:14 +11:00
Greg Wilkins 2a5fd34716 Suppress expected stack 2022-12-22 09:24:40 +11:00
Greg Wilkins 81b5fa61cf Avoid using `formatted` in getId 2022-12-22 09:22:29 +11:00
Joakim Erdfelt 0485fdf2f3
Fixing FileID.getFileName when dealing with opaque URIs 2022-12-21 14:51:28 -06:00
Joakim Erdfelt ff48442fa0
Narrowing in on possible bug in jar:file:// handling of Resource.getFileName() 2022-12-21 14:39:20 -06:00
Joakim Erdfelt fe74264ecc
Simpler TreeTrie.isEmpty() method (#9075)
Avoid creating (Key)Set to just test for empty.
More test cases
2022-12-21 12:46:08 -06:00
Joakim Erdfelt ce52ffdd33
More meaningful .toString() implementations 2022-12-21 12:14:07 -06:00
Joakim Erdfelt e753f35965
Adding more LOG.debug() 2022-12-21 12:04:22 -06:00
Jan Bartel 1abaeb6cee
Jetty 12.0.x osgi (#9068) 2022-12-21 08:12:44 -06:00
Olivier Lamy 964e44527d fix package change with new groovy 4.x version
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-12-21 22:04:00 +10:00
Joakim Erdfelt 869f841a72
Increase DEBUG 2022-12-20 15:04:53 -06:00
Joakim Erdfelt 5265f8ce50
Enable DEBUG to see what's going on 2022-12-20 13:17:28 -06:00
Joakim Erdfelt c3847ce90f
Fix Warning on deprecated init param usage 2022-12-20 13:10:24 -06:00
Joakim Erdfelt e9ec1f423c
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-20 12:56:27 -06:00
Joakim Erdfelt 6f9c3367fc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-20 12:54:17 -06:00
Joakim Erdfelt b01bcdc4bd
Improve `IncludeExcludeSet` testing (#9071)
* Improve IncludeExcludeSet testing

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-12-20 11:43:07 -06:00
Joakim Erdfelt c7e866562f
Enable all jetty-deploy tests (#9058)
* Enable all jetty-deploy tests
2022-12-20 11:40:49 -06:00
Greg Wilkins 12d66f083a Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-20 11:20:39 +11:00
Greg Wilkins f9ba12b07f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-20 11:17:29 +11:00
Greg Wilkins 4916377686
PathMappings optimizations (#9055)
* Avoid iterations if only ServletPathSpec instances
* Avoid tests for empty mappings.
* Better reset implementation
* More test coverage
2022-12-20 11:08:40 +11:00
Jan Bartel 721a4c74fa
Jetty 12.0.x ee10 convert cookie (#9057)
* Convert HttpCookie -> Cookie based on compliance mode.
* Fix max-age
* Fix old cookie handling; getCookies return null instead of empty list
2022-12-20 10:22:38 +11:00
Olivier Lamy 99b1b1e240
jetty 10.0.x fix jdk19 build upgrading and re enable m-invoker-p which now supports jdk19 (#9023)
* use m-invoker-p 3.4.0

Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-12-20 08:37:57 +10:00
Greg Wilkins c18e790858
Jetty 12 handler as boolean processor (#9035)
Alternative Handler architecture.

All Handlers are Processors, which now return a boolean to indicate the request has been accepted.
The request/response/callback are no longer modal, so there is no race with the boolean return.

Optimized PathMappings.
Avoid iterations if only ServletPathSpec instances
Avoid tests for empty mappings.
Better reset implementation
Improve suffix matching
Improve exact matching

Renamed HttpStream.getNanoTimeStamp() to getNanoTime().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-19 16:02:26 +01:00
Lachlan Roberts 06f9e5ec18 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-httpcontentFactoryCleanup 2022-12-19 21:46:05 +11:00
Greg Wilkins 9f5cb0c691
Async not supported without wrappers (#9061) 2022-12-19 13:23:56 +11:00
Jan Bartel dc49639444 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-19 10:11:49 +11:00
Jan Bartel 5c0974e758 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-19 09:27:20 +11:00
Jan Bartel aa40193d67
Jetty 10.0.x add plugin overlay test (#9045)
* Add overlay test for jetty-maven-plugin 

Signed-off-by: Jan Bartel <janb@webtide.com>
2022-12-19 09:17:09 +11:00
Greg Wilkins c55938c3fa Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-17 10:29:34 +11:00
Greg Wilkins 7e1c42c0e5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-17 09:45:40 +11:00
Greg Wilkins d24a521930
Serialize onCompleteFailure for #9059 (#9062)
Serialize onCompleteFailure for #9059

* Fixed case where process() throws an exception.
   Before, exiting the processing loop would always skip to invoke onCompleteFailure(), causing the callback to not be completed.
   Now we fall through and possibly invoke onCompleteFailure() if it was not already invoked.

* Updated javadocs.

* Code cleanups.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-17 09:43:07 +11:00
Lachlan Roberts 0f1420fbd7 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-16 17:17:12 +11:00
Joakim Erdfelt 124cc43931
Small cleanup of codeql-analysis 2022-12-14 13:50:37 -06:00
Joakim Erdfelt eed3843d11
Bump java_version to 17 2022-12-14 13:48:52 -06:00
Joakim Erdfelt 3c4fdad9ce
Enable ExternalSiteTest 2022-12-14 13:43:25 -06:00
Joakim Erdfelt 1cecf13575
Enable ConscryptHTTP2ClientTest 2022-12-14 13:36:59 -06:00
Lachlan Roberts a5817144f6 fix HttpContent.Factory config in ResourceHandlerTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-14 18:16:32 +11:00
Jan Bartel f139b66d63
Issue #9046 Fix tck session invalidate test (#9047) 2022-12-14 08:25:52 +11:00
Simone Bordet e16b7948b2 Fixes #9038 - Jetty 12 - Review EE10 Http[Input|Output].Interceptor APIs
Removed HttpInput.Interceptor and HttpOutput.Interceptor.
Simplified AsyncContentProducer.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-13 15:33:27 +01:00
Lachlan Roberts 60656ebb72 make stylesheet final in StaticHttpContentFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-13 10:48:06 +11:00
Lachlan Roberts 9270e62f78 rename of StaticHttpContentFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-13 10:44:35 +11:00
Joakim Erdfelt de5e19b2d0
Merge pull request #9039 from eclipse/fix/jetty-12.0.x/mystery-jakarta-servlet-jsp-jstl-3.0.0-RC1
Jetty 12 - Fix `jakarta.servlet.jsp.jstl-api🫙3.0.0-RC1` warning
2022-12-12 16:58:05 -06:00
Lachlan Roberts abc40afd89 cleanups for HttpContent Factories
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-13 09:55:55 +11:00
Olivier Lamy 139d3f2a41
response#getWriter should throw UnsupportedEncodingException in case of bad character encoding used (#9037)
* response#getWriter should throw UnsupportedEncodingException in case of bad character encoding used

Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-12-13 08:47:52 +10:00
Joakim Erdfelt 172f2121ea
Fix for [WARNING] The POM for jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api🫙3.0.0-RC1 is missing, no dependency information available 2022-12-12 06:05:32 -06:00
Jan Bartel a6e8c6aa32
Fix lag in pom versions. (#9027) 2022-12-12 14:55:30 +11:00