b51813e408
Apply "instanceof pattern matching" in spring-websocket
...
This commit also applies additional clean-up tasks such as the following.
- final fields
- diamond operator (<>) for anonymous inner classes
This has only been applied to `src/main/java`.
2021-10-17 19:04:32 +02:00
08bce08018
Use text blocks with JUnit Jupiter 5.8.1
...
See gh-27450
2021-09-28 14:20:31 +02:00
93efb20a53
Fix broken links in Javadoc
...
This commit removes several links that were broken due to the removal
of various APIs in 6.0.
See gh-27480
2021-09-28 13:34:33 +02:00
16bf39ea1b
Merge branch '5.3.x'
2021-09-28 10:35:18 +02:00
2567b20949
Upgrade to spring-javaformat 0.0.28 and downgrade to Checkstyle 8.41
...
In order to be able to use text blocks and other new Java language
features, we are upgrading to a recent version of Checkstyle.
The latest version of spring-javaformat-checkstyle (0.0.28) is built
against Checkstyle 8.32 which does not include support for language
features such as text blocks. Support for text blocks was added in
Checkstyle 8.36.
In addition, there is a binary compatibility issue between
spring-javaformat-checkstyle 0.0.28 and Checkstyle 8.42. Thus we cannot
use Checkstyle 8.42 or higher.
In this commit, we therefore upgrade to spring-javaformat-checkstyle
0.0.28 and downgrade to Checkstyle 8.41.
This change is being applied to `5.3.x` as well as `main` in order to
benefit from the enhanced checking provided in more recent versions of
Checkstyle.
Closes gh-27481
2021-09-28 10:29:31 +02:00
48875dc44f
Fix Jetty WebSocket test failures
...
See gh-27424
2021-09-17 14:53:09 +01:00
d84ca2ba90
Jakarta EE 9 migration
...
Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles).
Closes gh-22093
Closes gh-25354
Closes gh-26185
Closes gh-27423
See gh-27424
2021-09-17 09:14:07 +02:00
cecc0849a8
Upgrade to Gradle 7.2
...
This commit upgrades Gradle to 7.2.
Gradle configuration names are updated accordingly.
This also upgrades Gradle build plugins.
See gh-26870
2021-09-13 09:37:35 +02:00
9f7a94058a
Update copyright date
...
See gh-27298
2021-08-19 16:23:38 +02:00
caf6760ddd
Fix grammatical errors in Javadoc
...
Closes gh-27298
2021-08-19 16:21:15 +02:00
af6fd6c303
Polish "Fix duplicate "the" in Javadoc and XSD"
...
See gh-27291
2021-08-19 08:54:38 +02:00
ac72277258
Fix duplicate "the" in Javadoc and XSD
...
See gh-27291
2021-08-19 08:44:03 +02:00
42edef0bcc
Avoid StringIndexOutOfBoundsException in WebSocketMessageBrokerStats
...
Prior to this commit, if the TaskExecutor configured in
WebSocketMessageBrokerStats for the inboundChannelExecutor or
outboundChannelExecutor was not a ThreadPoolTaskExecutor, a
StringIndexOutOfBoundsException was thrown when attempting to parse the
results of invoking toString() on the executor.
The reason is that ThreadPoolTaskExecutor delegates to a
ThreadPoolExecutor whose toString() implementation generates text
containing "pool size = ...", and WebSocketMessageBrokerStats'
getExecutorStatsInfo() method relied on the presence of "pool" in the
text returned from toString().
This commit fixes this bug by ensuring that the text returned from
toString() contains "pool" before parsing the text. If "pool" is not
present in the text, getExecutorStatsInfo() now returns "unknown"
instead of throwing a StringIndexOutOfBoundsException.
Closes gh-27209
2021-07-25 19:05:02 +02:00
e94811f1b9
Polish WebSocketMessageBrokerConfigurationSupportTests
2021-07-24 21:45:31 +03:00
c6e644e5c3
Polish "Downcast to InetSocketAddress for Jetty 10"
...
This commit uses the target type where getRemoteAddress and
getLocalAddress are defined.
See gh-27120
2021-07-13 09:38:37 +02:00
6d01d49b76
Downcast to InetSocketAddress for Jetty 10
...
Closes gh-27120
2021-07-12 15:04:14 +01:00
fbf4724d78
Replace Jetty 9 only constant with explicit value
...
Closes gh-27121
2021-07-09 20:16:58 +01:00
a2ef6badc4
Use StringBuilder.append(char) where possible
...
To slightly improve performance, this commit switches to
StringBuilder.append(char) instead of StringBuilder.append(String)
whenever we append a single character to a StringBuilder.
Closes gh-27098
2021-06-25 10:44:28 +02:00
23f396a231
Nullability refinements
2021-06-08 14:23:06 +02:00
8d17bcea5b
Validate top-level SockJS URL
...
Closes gh-26933
2021-05-26 11:26:02 +01:00
27c4e74e24
Update CORS Javadoc in spring-websocket
...
Closes gh-26753
2021-04-13 17:43:40 +01:00
0fd774e69f
Add allowedOriginPatterns to WebSocketHandlerRegistration
...
Closes gh-26593
2021-02-24 09:37:20 +00:00
1dd7d53de0
More precise mapping for WebSocket handshake requests
...
Closes gh-26565
2021-02-19 11:49:44 +00:00
df977a2fd2
Nullability refinements and related polishing
2021-02-14 17:57:32 +01:00
164b48e25f
Polishing STOMP/WebSocket config
2021-02-05 11:53:46 +00:00
cf52246319
WebSocketExtension#equals matches sub-classes too
...
Closes gh-26449
2021-01-27 20:39:44 +00:00
aa7584d252
Support for Jetty 10
...
Closes gh-26123
2021-01-21 20:16:21 +00:00
1195b3a0b0
Polishing
2020-12-08 10:39:56 +01:00
0172424635
Avoid CGLIB proxies on websocket/messaging configurations
...
This commit updates websocket and messaging configurations in order
to not use CGLIB proxies anymore. The goal here is to allow support
in native executables and to increase the consistency across the
portfolio.
Closes gh-26227
2020-12-07 12:18:29 +01:00
684e695b08
Expose allowedOriginPatterns in SocketJS XML config
...
Closes gh-26108
2020-11-18 21:20:38 +00:00
8130bf505f
Apply allowedOriginPatterns in SockJsService
...
See gh-26108
2020-11-18 20:57:49 +00:00
9beca06404
Polishing contribution
...
See gh-26108
2020-11-18 20:25:39 +00:00
ae75db2657
Add allowedOriginPatterns to SockJS config
...
See gh-26108
2020-11-18 19:41:32 +00:00
6bb3ad793e
Add isOpen to WebSocketSession in WebFlux
...
Closes gh-26043
2020-11-09 14:06:43 +00:00
e592634290
Polishing
2020-11-09 13:32:41 +01:00
bcd2b9a8a7
Further refine logging in StompErrorHandler
...
In 5.3.x and forward, completely avoid logging unsent CONNECT messages
that are most likely authentication issues before the session is even
established.
Closes gh-26026
2020-11-05 21:50:12 +00:00
17dd7785f6
Refine logging in StompErrorHandler
...
Avoid a full stacktrace at ERROR level for a client message that could
not be sent to a MessageChannel.
See gh-26026
2020-11-05 21:34:56 +00:00
3eb2c5e22f
Use static accessors in DefaultSimpUserRegistry
...
Closes gh-26010
2020-11-02 17:25:57 +00:00
705cf09ad7
Merge branch '5.2.x'
2020-10-26 15:05:35 +01:00
449377908f
Fix JUnit 4 to AssertJ migration bugs
...
The migration from JUnit 4 assertions to AssertJ assertions resulted in
several unnecessary casts from int to long that actually cause
assertions to pass when they should otherwise fail.
This commit fixes all such bugs for the pattern `.isNotEqualTo((long)`.
2020-10-26 14:53:09 +01:00
dff9924a0c
WebSocketTransportRegistration: javadoc typo
...
The documentation written for the method WebSocketTransportRegistration.setSendTimeLimit(int timeLimit) mentions that, if no time limit is specified, a default value of 10 seconds is used; however, later on the exact default value employed is incorrectly typed as 10 * 10000 ms, which would result in 100 seconds instead.
The javadoc has been updated in order to show the correct value in milliseconds (10 * 1000).
2020-10-20 12:52:46 +01:00
bfb2ce6e2a
SimpUser exposes Principal
...
Closes gh-25191
2020-10-19 21:40:09 +01:00
8a04910bdd
Drop explicit zeroing at instantiation of Atomic* objects
2020-10-06 15:45:12 +02:00
e02d3f32b4
Requalify tests as LONG_RUNNING
...
Prior to this commit, some tests would belong to the PERFORMANCE
`TestGroup`, while they were not testing for performance but rather
performing functional tests that involve long running operations or
timeouts.
This commit moves those tests to the LONG_RUNNING `TestGroup`.
See gh-24830
2020-09-25 13:43:38 +02:00
214bc407b4
Provide Gson/JSON-B MessageConverter for spring-messaging (aligned with spring-web)
...
Closes gh-21496
2020-09-25 10:48:25 +02:00
dd011c991c
Merge branch '5.2.x' into master
2020-09-07 21:41:30 +01:00
d616c6632d
Remove session on 4xx response from WebSocket handshake
...
Closes gh-25608
2020-09-07 21:27:52 +01:00
a8d953afa4
CloseStatus implements Serializable
...
Closes gh-25507
2020-08-28 20:43:45 +01:00
bb941b6180
OrderedMessageChannelDecorator doesn't preclude send limits
...
Closes gh-25581
2020-08-28 20:40:55 +01:00
ff11467a0c
Avoid resizing of fixed-size HashMap/LinkedHashMap variants
...
Closes gh-25349
2020-08-25 19:26:18 +02:00
9aae5ed3fa
Update Reactor Netty modules
...
Since reactor/reactor-netty#739 , the `reactor-netty` module is now split
into two: `reactor-netty-core` and `reactor-netty-http`.
This commit updates the Spring Framework build accordingly.
2020-08-01 11:49:15 +02:00
335c3d5db6
Polish contribution
...
See gh-25445
2020-07-22 17:26:59 +02:00
ab859fcc96
Refine use of substring operations
...
Closes gh-25445
2020-07-22 17:26:42 +02:00
a8901e3cf8
Polish contribution
...
See gh-25445
2020-07-22 16:36:14 +02:00
edfc6c0293
Refine use of substring operations
...
Closes gh-25445
2020-07-22 16:28:58 +02:00
ae5913f3b6
Polish tests
...
See gh-25456
2020-07-22 11:09:52 +02:00
cd12583e13
Use Integer.parseInt instead of Integer.valueOf for primitive int
...
Closes gh-25456
2020-07-22 10:54:32 +02:00
24f9b1d966
Delete unused import
2020-07-22 10:40:59 +02:00
e4a139e70e
Use System.currentTimeMillis() in AbstractSockJsService
...
Closes gh-25447
2020-07-22 10:39:27 +02:00
3b12beb1b8
Simplify if-statements with instanceof checks
...
Closes gh-25449
2020-07-22 10:34:27 +02:00
7ce4d150ce
Merge branch '5.2.x'
2020-07-20 18:02:22 +03:00
64f4703445
Defer creating logger in StandardWebSocketHandlerAdapter to instantiation time
...
Closes gh-25427
2020-07-20 16:47:32 +02:00
9d5881e0ad
Suppress warnings, remove unused code, etc.
2020-06-20 17:15:35 +02:00
7949937655
Remove redundant assignment of default values to volatile fields
2020-06-17 10:50:51 +02:00
8099fc8178
Use try-with-resources language construct where feasible
...
Closes gh-2063
Co-authored-by: igor-suhorukov <igor.suhorukov@gmail.com>
2020-06-16 22:57:45 +02:00
9cd9a8e86b
Extend readOnlyWebSocketHttpHeaders deprecation to 5.1.16
2020-06-06 14:41:06 +02:00
706446a660
Deprecate unused method
2020-05-08 14:30:10 +01:00
6659e96104
Fix failing test
...
See gh-24986
2020-05-01 18:20:26 +01:00
e17736dd0a
Error handling improvement in AbstractSockJsSession
...
Closes gh-24986
2020-05-01 16:45:25 +01:00
f425a993e7
Ignore missing STOMP decoder if session closed
...
Closes gh-24842
2020-04-27 13:19:43 +01:00
e26764d249
Remove duplicate words in documentation and polish Javadoc
2020-03-31 12:17:58 +02:00
9e30620ac2
Polish contribution
...
See gh-24805
2020-03-30 13:47:00 +02:00
e63d1cf12d
Improve usage of ByteArrayOutputStream/ByteArrayInputStream
...
Closes gh-24805
2020-03-30 13:22:21 +02:00
6222efc54b
Polish contribution
...
See gh-24785
2020-03-26 16:52:24 +01:00
65aa2d03f0
Simplify conversion of ByteArrayOutputStream to String
...
Closes gh-24785
2020-03-26 16:52:14 +01:00
1f9fa3bab8
Remove useless .gitignore files
...
Closes gh-24790
2020-03-26 15:53:39 +01:00
fd1ca46ca1
Thread-safe access to WebSocketServerFactory and WebSocketExtensions
...
See gh-24745
2020-03-23 17:56:14 +01:00
0e5f27c94e
Introduce NonNull to package-info
2020-03-23 15:42:02 +01:00
45a629e20a
Remove unnecessary check in ConvertingEncoderDecoderSupport
2020-03-20 21:25:29 +00:00
fa6ccc066d
Do not raise exception for undelivered empty messages
...
Closes gh-23828
2020-03-13 14:58:31 +00:00
1a8caf9e2b
Polishing and minor refactoring
...
See gh-23828
2020-03-13 14:58:31 +00:00
f5df422de9
Polishing contribution
...
See gh-24470
2020-02-03 20:32:36 +00:00
273812f9c5
Remove unnecessary escapes in regular expressions
...
See gh-24470
2020-02-03 20:22:40 +00:00
7b6d83a106
Use Gradle test fixture support for spring-web
...
See gh-23550
2020-01-02 16:01:35 +01:00
94f8ef08e2
Move common TestPrincipal to spring-core test fixtures
...
See gh-23550
2020-01-02 16:01:35 +01:00
4260c34b47
Rename test fixture package in spring-core
...
See gh-23550
2020-01-02 16:01:34 +01:00
5718bf424b
Use Gradle test fixture support for spring-core
...
See gh-23550
2020-01-02 16:01:34 +01:00
f57f337104
Protected method to decorate WebSocketHandler
...
See gh-24075
2019-11-26 12:08:22 +00:00
526d89e1e6
Refine Throwable handling in spring-websocket
...
This commit lowers the level of Throwable handling in parts of
spring-websocket which now handle Exception instead and allow any Error
to propagate.
Closes gh-24075
2019-11-26 12:04:00 +00:00
905e3c1f9f
Avoid indefinite wait in JettyWebSocketClient
...
Closes gh-23994
2019-11-14 17:37:10 +00:00
32532a88c1
Polishing
2019-11-13 16:17:08 +01:00
8bb165e55c
Fix typo in EventSourceTransportHandler
...
Closes gh-23984
* 3a0f309e2c/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java (L24)3a0f309e2c/spring-web/src/main/java/org/springframework/http/codec/ClientCodecConfigurer.java (L88)ef14d76d36/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java (L94)3a0f309e2c/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/EventSourceTransportHandler.java (L33)
2019-11-13 14:23:58 +00:00
1a13700f8b
Polish contribution
...
See gh-23923
2019-11-06 12:57:01 +01:00
9da15ee23a
Improve usage of String.substring()
...
Closes gh-23923
2019-11-06 12:57:01 +01:00
9f00eb68e9
Clean up warnings
2019-10-30 19:14:58 +01:00
3c17178b16
Fix Mockito deprecations
2019-10-30 18:30:05 +01:00
3895d21b7d
Fix failing test after previous commit
...
See gh-23793
2019-10-30 07:03:51 +00:00
03ac8e6b42
Logging decorator for WebSocketStompClient handler
...
Closes gh-23793
2019-10-30 06:55:04 +00:00
b343e733df
Upgrade Jetty to 9.4.21
...
Make use of the new getAvailableExtensionNames() method.
Closes gh-23565
2019-10-23 16:51:04 +01:00
2861fc65bd
Polishing
2019-09-27 10:17:56 +02:00
Sam Brannen
Rossen Stoyanchev
Juergen Hoeller
Brian Clozel
LEE Juchan
Stephane Nicoll
Sanghyuk Jung
Sébastien Deleuze
Benjamin Faal
jacopo-salamina
Сергей Цыпанов
XenoAmess
Rossen Stoyanchev
Sam Brannen
Qimiao Chen
Juergen Hoeller
Hyunjin Choi
JohnGrib
Christoph Dreis