Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,874 Commits 68 Branches 465 Tags 360 MiB
Commit Graph

18874 Commits

Author SHA1 Message Date
Jan Bartel 8548a49200
Issue #3680 Remove config-only infinispan artifacts from bom. (#3688) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-05-28 13:42:10 +02:00
Jan Bartel 4340a382e5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-05-28 13:40:06 +02:00
Jan Bartel 73b417a116
Issue #3690 Upgrade to asm 7.1 (#3691) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-05-28 13:39:14 +02:00
Lachlan Roberts 77d95d039c Issue #3696 - unwrap ExecutionException in javax WS connectToServer 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-28 11:55:31 +10:00
Greg Wilkins cf9c238721 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3681-HttpFieldsOptimize 2019-05-26 16:18:13 +02:00
olivier lamy a5859fb809 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-24 16:26:33 +10:00
Michael Hausegger a3b755858d Added additional Unit Tests to increase code coverage (#3692) 
* Added additional Unit Tests to increase code coverage

Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-24 16:24:40 +10:00
Lachlan 49356bb5c5
Merge pull request #3660 from lachlan-roberts/jetty-10.0.x-configuration-refactor 
jetty-10 WebSocket configuration refactor
 2019-05-24 10:40:30 +10:00
Lachlan Roberts e5a6910be4 Issue #3666 - changes from review 
- code cleanups
- made SHUTDOWN 1001 status an abnormal close status

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-24 05:58:02 +10:00
Lachlan Roberts 9e09f76fda Issue #3666 - error CloseFrames skip frames in the FrameFlusher queue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-24 05:54:49 +10:00
Greg Wilkins 53dc425bde Issue #3681 
updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-23 12:33:35 +02:00
olivier lamy 68fa24e463 fix bad merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-23 16:31:02 +10:00
Lachlan 19e80ff788
Merge pull request #3685 from lachlan-roberts/jetty-10.0.x-83-sessiontrackingtest-failures 
Issue #83 - reworked SessionTrackingTest to fix intermittent failures
 2019-05-23 16:10:30 +10:00
olivier lamy d377db5d26 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-23 14:18:39 +10:00
Olivier Lamy 0ebc0fa9ce
Issue #3659 jmh tests are creating to many tmp files and never cleaned (#3650) 
* cleanup tmp files created by jmh tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-23 14:12:44 +10:00
Lachlan Roberts d6c68c4911 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-configuration-refactor 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-23 09:03:27 +10:00
Olivier Lamy f2c59a3cb7
add convenient StringUtil isEmpty method (#3687) 
* add StringUtil.isEmpty

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-23 09:01:36 +10:00
Greg Wilkins 4dc004cf96 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3681-HttpFieldsOptimize 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:26:48 +02:00
Greg Wilkins d37038496e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:21:02 +02:00
Greg Wilkins 0bf138f034 removed unused lines 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:10:12 +02:00
Greg Wilkins 065581edd9 cleanups 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:10:12 +02:00
Greg Wilkins 26169491c9 Issue #3655 simplifications of Cookie handling 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:10:12 +02:00
Joakim Erdfelt 2de5456790 Issue #3655 - Fixing javadoc 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-22 23:10:12 +02:00
Joakim Erdfelt 5d267963a3 Issue #3655 - Cookie generation now complies with RFC6265 spaces 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-22 23:10:12 +02:00
Simone Bordet fd542c2856
Merge pull request #3591 from eclipse/jetty-9.4.x-3550-QueuedThreadPool-cleanup 
Jetty 9.4.x 3550 queued thread pool cleanup
 2019-05-22 18:18:49 +02:00
Simone Bordet b70d22fee8 Issue #3550 - QueuedThreadPool cleanup. 
Improved code formatting.
Removed unnecessary code in doStop().
Now explicitly checking whether idleTimeout > 0 before shrinking.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-05-22 18:17:44 +02:00
Greg Wilkins 2ba0c7bb79 Issue #3681 
cacheContent type and avoid unnecessary character encoding calculations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 14:12:52 +02:00
Greg Wilkins 70311fe987 Issue #3681 
minor cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 14:02:38 +02:00
Greg Wilkins 4ac511ba13 Issue #3681 
minor cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 13:00:48 +02:00
Greg Wilkins 8578e684d8 Issue #3681 
Even more benchmark variations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 11:13:08 +02:00
Greg Wilkins 2256c532be Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 10:30:25 +02:00
Greg Wilkins ab8670370f Issue #3681 
More benchmark variations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 09:28:55 +02:00
Lachlan Roberts 52cc4f6c22 Issue #83 - reworked SessionTrackingTest to fix intermittent failures 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 17:16:52 +10:00
Greg Wilkins 2d358cd4b3 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3681-HttpFieldsOptimize 2019-05-22 08:30:00 +02:00
Lachlan Roberts f4990dd0f5 prefer the field and variable name of coreSession instead of session 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Lachlan Roberts 491ff5eb93 rename WebSocketChannel to WebSocketCoreSession 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Michael Hausegger 1e84a04682 Removed blank 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-22 08:27:53 +02:00
Michael Hausegger e8f11d3c7e Added small performance improvements 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-22 08:27:53 +02:00
Joakim Erdfelt 6e44a7cfd1 More changes from PR feedback 
Both Formatters / CodeStyles
+ Maximum Line Length for wrapping is now 128
  (Sorry, cannot turn it off, but we can set it high)

Eclipse Formatter
+ javadoc formatting turned off
+ line comment formatting turned off
+ block comment formatting is turned off
+ preserving whitespace between code and comments
+ don't join already wrapped lines of code or comments
+ keeping empty array initializers on one line
+ brace position for array inializers are on next line

IntelliJ Formatter
+ turn off various javadoc / block / line formatting
+ consecutive blank lines capped at 1
+ align multiline array initializers
+ turned off brace force on if statements
+ array initializer braces on new line

Checkstyle Rules
+ disabled NeedBraces
+ NoWhitespaceAfter now allows lineBreaks without a violation

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-21 11:08:15 -05:00
Greg Wilkins f07e59554b Issue #3681 
remove HttpFields instrumentation

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-21 15:26:52 +02:00
Greg Wilkins b0985c4ad4 Issue #3681 
added iteration test to benchmark

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-21 15:06:16 +02:00
Greg Wilkins fd183af1cc Issue #3681 
instrumented HttpFields

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-21 14:26:01 +02:00
Greg Wilkins 1458854d24 Issue #3681 
Use LinkedHashMap<List<Pair>>

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-21 13:59:52 +02:00
Greg Wilkins 2831bfb159 Issue #3681 
Better default HttpFields size with TODOs to tune.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-21 12:40:40 +02:00
Greg Wilkins 5f1a8696b1 Issue #3681 
Benchmark possible HttpFields lookup mechanisms

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-21 12:39:28 +02:00
Lachlan Roberts 5f62e0f2db store shared websocket components as attributes and not beans 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-21 18:56:53 +10:00
Lachlan Roberts e31009cb06 WebSocketCoreClient no longer stores configuration and can be shared 
configuration moved to ClientUpgradeRequest

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-21 11:33:06 +10:00
Joakim Erdfelt d99f639c20 Merge branch 'jetty-9.4.x-checkstyle' of github.com:eclipse/jetty.project into jetty-9.4.x-checkstyle 2019-05-20 14:42:50 -05:00
Joakim Erdfelt 9cb8fb30fd Updating checkstyle rules from PR feedback. 
+ NeedBraces is turned on, but excluded for single line IF statements
+ OperatorWrap is split into 2 rules.
  1. (OperatorWrapNextLine) for "?" and ":" tokens.
  2. (OperatorWrapSameLine) for all other tokens
+ NoWhitespaceAfter enabled with default tokens + TYPECAST
 2019-05-20 14:40:53 -05:00
Joakim Erdfelt 3cb588b28b Updating IDE formatters / codestyles from PR feedback. 
+ Lambda braces are always on new line
+ Space after (cast) is removed
+ Do not force braces on single line if statements, only on multi-line.
 2019-05-20 14:23:44 -05:00