1
0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-15 02:54:49 +00:00

2540 Commits

Author SHA1 Message Date
Greg Wilkins
9706d70484
Jetty 9.4.x reformat ()
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
  internal default values.
  We want to keep those values as a hedge against future default
  value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
Lachlan Roberts
e67532372c Issue - ensure Sessions are stopped before CompressionPools
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 09:09:20 +10:00
Joakim Erdfelt
5e3cecee6f
Merge pull request from eclipse/jetty-9.4.x-websocket-sci-from-embedded
Issue  - Reworking WebSocket SCI's to be more flexible in embedded
2019-06-19 15:31:59 -05:00
Joakim Erdfelt
a847f54cd2
Merge pull request from eclipse/jetty-9.4.x-3648-websocket-client-ssl
Issue  - SSL based on WebSocket behavior (CLIENT vs SERVER)
2019-06-18 08:05:33 -05:00
Lachlan Roberts
30dc103a12 Issue - manage deflater/inflater pools with ContainerLifeCycle
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-18 12:31:25 +10:00
Lachlan
a18bd12ada Issue - use the default port of 0 for WebSocket tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-17 13:28:38 +10:00
Joakim Erdfelt
f05d6cf9ad Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-300-CompressionPool 2019-06-14 08:38:08 -05:00
Joakim Erdfelt
8c0f889abd Issue - Updating javadoc on .initialize() method purpose/meaning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-14 08:37:01 -05:00
Joakim Erdfelt
49ee5ac3c0 Merge branch 'jetty-9.4.x' into 'jetty-9.4.x-websocket-sci-from-embedded' 2019-06-14 08:23:42 -05:00
Lachlan Roberts
c30c335df3 Issue - shared Inflater/Deflater pools for WebSocket
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-14 16:20:00 +10:00
Joakim Erdfelt
40e9e053b9
Merge pull request from eclipse/jetty-9.4.x-3708-stringutil-replace
Issue  - use StringUtil alternatives for known slow JVM impls.
2019-06-13 14:01:35 -05:00
Joakim Erdfelt
9e368726d7 Attempting to address stats difference 2019-06-12 15:10:22 -05:00
Joakim Erdfelt
fab70bd13c Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-06-12 12:42:42 -05:00
Joakim Erdfelt
aa8c0bb879 Reworking testcase to be more resilient
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 12:42:28 -05:00
Joakim Erdfelt
877815e195 Issue - Adding new methods and converting codebase to use them
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 09:56:41 -05:00
Joakim Erdfelt
776c093b70 Merge branch 'release-9.4.19' into jetty-9.4.x 2019-06-12 06:44:27 -05:00
Lachlan Roberts
e8115268d4 Issue - rework of inflater and deflater pools
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-12 14:21:40 +10:00
Joakim Erdfelt
2ea0bca333 Cleanup of testcase, unable to replicate failure.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 13:10:55 -05:00
Joakim Erdfelt
ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt
afcf563148 Updating to version 9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Joakim Erdfelt
5dbc0bdaa5
Merge pull request from eclipse/jetty-9.4.x-3743-xmlconfig-locations
Issue  - Using Location based XmlConfiguration where possible
2019-06-10 11:08:51 -05:00
Joakim Erdfelt
550fb99e86 Issue - fixing javadoc 2019-06-07 07:01:06 -05:00
Simone Bordet
dd79b516f3 Fixes - NPE in WebSocketClient.toString().
Initializing field `sessionTracker` early to avoid NPE.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-07 11:36:42 +02:00
Joakim Erdfelt
986dd77e60 Issue - Applying changes from PR feedback.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 16:44:35 -05:00
Joakim Erdfelt
6686083462 Issue - Using only Location based XmlConfiguration in Jetty itself
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 11:55:01 -05:00
Joakim Erdfelt
631f0cd9f6 Issue - SSL based on WebSocket behavior (CLIENT vs SERVER)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 11:39:55 -05:00
Lachlan
ac8303c45e
Merge pull request from lachlan-roberts/jetty-9.4.x-3498-websocket-suspend
Issue  - jetty 9.4 websocket suspend for incoming frames
2019-06-04 13:42:24 +10:00
Joakim Erdfelt
a6b2bd86ef Issue - Changes based on review from @sbordet
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-03 15:52:41 -05:00
Joakim Erdfelt
54888d2541 Issue - Reworking WebSocket SCI's to be more flexible in embedded
+ Added new SCIOnStartupListener that allows for manual wiring up
  of ServletContainerInitializers (with no bytecode scanning)
  in embedded jetty usages
+ Introduced .initialized(context) and .configure(context) to both of
  the websocket SCIs
+ Moved ClientConnectTest to jetty-websocket-tests
+ Moved WebSocketClientTest to jetty-websocket-tests
+ Made moved tests not use BlockheadServer
+ Made moved tests use new .configure(context, lambda) methods
+ Also allowing javax.websocket.server SCI implementation to
  add ContextDestroyListener during the execution of another
  ServletContextListener.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-03 13:31:06 -05:00
Michael Hausegger
fdcbb214f8 Added tests for decoders
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-29 17:43:19 +02:00
Michael Hausegger
564ac4a2d3 Added Unit Tests for ReflectUtil.
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-29 17:09:45 +02:00
Simone Bordet
3af45f4c89
Merge pull request from eclipse/jetty-9.4.x-3663-remove-deps-in-wsclient-with-httpclient
Issue  - Remove @Deprecation's from WebSocketClient
2019-05-20 10:55:43 +02:00
Michael Hausegger
5760795f96 Corrected license header information
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-17 14:26:58 +02:00
Michael Hausegger
d4ffef3de7 Added tests for UpgradeResponseAdapter
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-17 14:26:58 +02:00
Joakim Erdfelt
0eb90e41d1 Issue - Remove @Deprecation's from WebSocketClient
+ Those methods and constructors that had @Deprecation assigned
  that urged the use of HttpClient directly are no longer
  annotated as deprecated because of legitimate possibility of
  a valid LinkageError

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-16 09:48:28 -05:00
Michael Hausegger
4f90eb6533 Added Unit Tests to increase code coverage.
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-16 08:25:34 +02:00
Joakim Erdfelt
b44ecc932a Issue - Replace B64Code with java.util.Base64
+ Deprecated B64Code
+ All code that isn't B64CodeTest is now using java.util.Base64
+ B64CodeTest is updated to confirm change to java.util.Base64
  is possible without change in behavior. Just have to make
  sure you use the appropriate Encoder / Decoder for the task
  at hand (default vs mime vs url)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-15 10:08:11 +02:00
Joakim Erdfelt
45a5b9c8b9 Adding TLS mode to websocket BrowserDebugTool.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-13 11:13:59 -05:00
Joakim Erdfelt
54d8faf664 Updating WebSocket Examples seen in documentation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-10 09:08:59 -05:00
lachan-roberts
cb50d6f9aa Issue - fix suspend implementation to suspend WebSocket frames
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-08 12:28:29 +10:00
lachan-roberts
7c7932a475 Issue - improve testing for websocket suspend
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-07 11:00:32 +10:00
Joakim Erdfelt
9d159318f5 Issue - Backport of SessionTracker from Jetty 10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-01 10:47:08 -05:00
Joakim Erdfelt
205c4dc498
Merge pull request from eclipse/jetty-9.4.x-update-test-helper
Update testing
2019-05-01 05:40:24 -07:00
Lachlan Roberts
bb8e5557d2 fix flaky test ClientCloseTest.testWriteException
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-01 07:58:24 +02:00
Joakim Erdfelt
41ab9baf8c Standardizing on hamcrest Matchers (not CoreMatchers from junit4)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:39:57 -05:00
Joakim Erdfelt
df716e1b23 Migrating away from junit5 deprecated isIn() to is(in())
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:33:28 -05:00
Joakim Erdfelt
c33f3a75ed Merge branch release-9.4.18 into jetty-9.4.x 2019-04-30 11:44:06 -05:00
Lachlan Roberts
8ddcf3685b Issue - give 400 error response for missing Sec-WebSocket-Key
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-30 15:11:51 +04:00
Joakim Erdfelt
734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt
e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00