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
e93ac7ac75
Merge branch '5.1.x'
2019-09-26 09:07:29 +01:00
e9dc5160b9
Use correct log level
...
See gh-23534
2019-09-26 07:00:27 +01:00
30e1257dda
Merge branch '5.1.x'
2019-09-24 13:39:42 +01:00
99d9dacc4f
Log sendBufferSizeLimit exceeded at warn
...
Closes gh-23534
2019-09-24 12:09:41 +01:00
20e6ca3601
Fix race condition in sendBlockingMessage
...
Previously, tests in ConcurrentWebSocketSessionDecoratorTests that use
the BlockingSession would fail intermittently. This appears to have
been due to a race condition in sendBlockingMessage where the call
to getSentMessageLatch() that stores a latch in nextMessageLatch on
the main thread may happen after the call to sendMessage that counts
down the latch if it is non-null occurs on the executor's thread.
This commit updates sendBlockingMessage to call getSentMessageLatch()
(and therefore store the latch) before it sumbmits the task to the
executor. This ensures that the latch will be available when the
exeuctor's thread attempts to retrieve and decrement it.
BlockingSession's AtomicReference fields have also been made final to
eliminate the possibility of any visibility problems across threads.
Closes gh-23642
2019-09-16 14:14:06 +02:00
d945ae9191
Add blank line between java and javax imports
...
See gh-23539
Co-authored-by: Sam Brannen <sbrannen@pivotal.io>
2019-09-16 13:41:59 +02:00
facdbdb7b6
Fix checkstyle violation
2019-09-05 09:18:43 +02:00
deba2ed1b3
Add blank line between java and javax imports
...
See gh-23539
2019-09-04 22:05:46 -07:00
2f106fbb32
Polishing web socket test to use BDD Mockito
2019-09-04 22:05:13 -07:00
d4089747b8
Use dependency management in Framework build
...
Prior to this commit, the Spring Framework build would partially use the
dependency management plugin to import and enforce BOMs.
This commit applies the dependency management plugin to all Java
projects and regroups all version management declaration in the root
`build.gradle` file (versions and exclusions).
Some versions are overridden in specific modules for
backwards-compatibility reasons or extended support.
This commit also adds the Gradle versions plugin that checks for
dependency upgrades in artifact repositories and produces a report; you
can use the following:
./gradlew dependencyUpdates
2019-09-02 18:01:09 +02:00
117119a88d
Merge branch '5.1.x'
2019-08-29 15:13:36 +03:00
c2d71922d7
Fix for change in Jetty 9.4.20.v20190813
...
Closes gh-23500
2019-08-29 10:52:16 +03:00
c004ef888c
Configure index in @ParameterizedTest display names
...
This commit prepends "[{index}] " to all custom display names
configured via @ParameterizedTest.
This provides better diagnostics between the "technical names" reported
on the CI server vs. the "display names" reported within a developer's
IDE.
See gh-23451
2019-08-28 17:06:23 +02:00
ad6231ad29
Add missing @Override annotations
2019-08-23 13:50:58 +02:00
617863ae4b
Polish WebSocket integration tests
2019-08-20 12:43:31 +02:00
288461a541
Introduce @EnabledForTestGroups in Spring's test suite
...
Closes gh-23476
2019-08-17 14:47:24 +02:00
3f3e41923f
Migrate rest of test suite from JUnit 4 to JUnit Jupiter
...
This commit migrates the rest of Spring's test suite to JUnit Jupiter,
except spring-test which will be migrated in a separate commit.
See gh-23451
2019-08-17 11:36:58 +02:00
38f6d270f8
Delete dead code in tests
2019-07-18 12:20:26 +02:00
fde92793b5
Fix http URLs
...
See gh-22839
2019-07-11 18:14:20 +02:00
1728bf17fc
Avoid unnecessary boxing where primitives can be used
...
Closes gh-23267
2019-07-10 16:51:18 +02:00
3d913b8134
Merge branch '5.1.x'
2019-07-03 17:25:12 +01:00
4e6e47b726
Earlier detection of token authentication
...
Use a callback to detect token authentication (via inteceptor) thus
avoiding a potential race between that detection after the message is
sent on the inbound channel (via Executor) and the processing of the
CONNECTED frame returned from the broker on the outbound channel.
Closes gh-23160
2019-07-03 15:24:27 +01:00
5af9a8edae
Ensure WebSocketHttpRequestHandler writes headers
...
Closes gh-23179
2019-07-03 15:24:27 +01:00
d0231cb29a
Presort beans in ControllerAdviceBean.findAnnotatedBeans()
...
Prior to this commit, all clients of
ControllerAdviceBean.findAnnotatedBeans() sorted the returned list
manually. In addition, clients within the core Spring Framework
unnecessarily used AnnotationAwareOrderComparator instead of
OrderComparator to sort the list.
This commit presorts the ControllerAdviceBean list using OrderComparator
directly within ControllerAdviceBean.findAnnotatedBeans().
Closes gh-23188
2019-06-24 16:26:11 +03:00
b296545af8
Handler StreamingHttpOutputMessage in XHR transport
...
Closes gh-23030
2019-06-07 16:40:58 -04:00
098ac0bbb8
Annotate Object#equals parameter with @Nullable
...
Closes gh-23093
2019-06-06 14:18:30 +02:00
1259b7cb49
Polishing
2019-06-05 14:41:14 +03:00
e89fd5c3be
Merge branch '5.1.x'
2019-06-03 16:34:58 -04:00
d2ec876f57
Consistently close connection after ERROR frame
...
Closes gh-23039
2019-06-03 16:22:43 -04:00
141ef9082f
Clean up Mockito usage
...
This commit migrates to the MockitoJUnitRunner where sensible, which
will later allow for an easier migration to Mockito's extension for
JUnit Jupiter.
In addition, this commit deletes unnecessary stubbing for various mocks
and polishes test fixture setup in various test classes.
2019-05-28 13:59:43 +02:00
9d74da006c
Migrate JUnit 4 assertions to AssertJ
...
Migrate all existing JUnit 4 `assert...` based assertions to AssertJ
and add a checkstyle rule to ensure they don't return.
See gh-23022
2019-05-23 15:52:49 -07:00
95a9d46a87
Migrate Hamcrest assertions to AssertJ
...
Migrate all existing `assertThat(..., Matcher)` assertions to AssertJ
and add checkstyle rules to ensure they don't return.
See gh-23022
2019-05-23 15:49:59 -07:00
2294625cf0
Exposes STOMP frame stats
...
Closes gh-23015
2019-05-23 18:32:11 -04:00
e09c5fd9e5
Use TaskExecutor instead of ThreadPoolTaskExecutor
...
Closes gh-22943
2019-05-23 14:26:51 -04:00
0b2fcbfe8a
Use TaskScheduler instead of ThreadPoolTaskScheduler
...
Closes gh-22943
2019-05-23 14:01:05 -04:00
c329bad42a
Merge branch '5.1.x'
2019-05-21 00:16:35 +02:00
8cd3daad0d
Polishing
2019-05-21 00:15:40 +02:00
171e8f56a3
Merge branch '5.1.x'
2019-05-20 22:27:37 +02:00
75d751d968
Polishing
2019-05-20 22:19:11 +02:00
6f07a504b8
A couple of trivial simplifications
2019-05-20 21:41:15 +02:00
02850f357f
Migrate exception checking tests to use AssertJ
...
Migrate tests that use `@Test(expectedException=...)` or
`try...fail...catch` to use AssertJ's `assertThatException`
instead.
2019-05-20 10:47:53 -07:00
798b51f4a3
Migrate to BDD Mockito
...
Migrate all tests to consistently use BDD Mockito. Also add
checksyle rule to enforce going forwards.
2019-05-08 13:46:13 -07:00
816bbee8de
Remove '.*' imports from tests
...
Organize test imports to expand all '.*' static imports into
fully qualified imports.
This update will allow us to use additional checkstyle rules in
the future, and will also help if we migrate fully to AssertJ.
2019-05-08 09:55:09 -07:00
d7320de871
Migrate away from ExpectedException ( #22922 )
...
* Add limited checkstyles to test code
Add a limited set of checkstyle rules to the test codebase to improve
code consistency.
* Fix checksyle violations in test code
* Organize imports to fix checkstyle for test code
* Migrate to assertThatExceptionOfType
Migrate aware from ExpectedException rules to AssertJ exception
assertions. Also include a checkstyle rules to ensure that the
the ExpectedException is not accidentally used in the future.
See gh-22894
2019-05-08 16:25:52 +02:00
49570ae2f3
Fix typo
2019-05-07 14:25:22 +02:00
ccb01e663a
Merge branch '5.1.x'
2019-05-07 13:03:45 +02:00
4aaec942c4
Introduce HTTPS mappings in spring.schemas files
...
Closes gh-22903
2019-05-07 12:56:42 +02:00
47c39304af
Use assertThat from Hamcrest instead of JUnit 4
...
org.junit.Assert.assertThat() is deprecated as of JUnit 4.13.
See gh-22894
2019-05-05 18:27:38 +02:00
Rossen Stoyanchev
Juergen Hoeller
Brian Clozel
Sam Brannen
XenoAmess
Сергей Цыпанов
Rossen Stoyanchev
Sam Brannen
Qimiao Chen
Juergen Hoeller
Hyunjin Choi
JohnGrib
Christoph Dreis
Andy Wilkinson
Phillip Webb
Stephane Nicoll
Brian Clozel
Rob Winch
Sebastien Deleuze
Johnny Lim