c91041b675
Improve RSocketClientToServer*IntegrationTests reliability
...
Those new delays seems to make tests more reliable.
Closes gh-30844
2023-07-09 18:39:50 +02:00
b3de1b8e95
Use consistently *KotlinTests naming for Kotlin tests
...
Closes gh-30837
2023-07-08 11:02:20 +02:00
c1a8b9a14d
Polishing
2023-07-04 21:24:35 +02:00
6526e79eea
Polishing
2023-06-26 19:28:38 +02:00
d3a249e34d
Reduce the delay used for Coroutines in tests
...
Closes gh-30731
2023-06-23 14:17:56 +02:00
76f94e998e
Merge branch '6.0.x'
2023-07-09 18:41:58 +02:00
8fb412ea74
Merge branch '6.0.x'
2023-07-08 11:11:37 +02:00
1777e7f3b7
Merge branch '6.0.x'
...
# Conflicts:
# spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
# spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
2023-07-04 21:40:11 +02:00
6fa09e1783
Extract AnnotatedMethod base class for consistent annotation exposure
...
As a consequence, the spring-messaging HandlerMethod detects interface parameter annotations as well, and the same is available for other HandlerMethod variants.
Closes gh-30801
2023-07-04 20:42:30 +02:00
3f40452511
Merge branch '6.0.x'
2023-06-26 19:36:20 +02:00
35667e81ea
Merge branch '6.0.x'
2023-06-23 14:20:13 +02:00
06b6c4bcf9
Update copyright headers
2023-06-22 14:56:09 +02:00
db19f6395d
Polishing
...
Closes gh-29768
2023-06-20 17:18:40 +01:00
b677ff20fe
AbstractMessageConverter delegates null headers
...
See gh-29768
2023-06-20 17:18:40 +01:00
b98c1ec36a
Apply default value in case of null after conversion
...
Closes gh-29550
2023-06-20 17:18:40 +01:00
526d9eae7f
Merge branch '6.0.x'
2023-06-15 16:20:19 +02:00
4565bcd757
Update copyright headers
2023-06-15 16:19:58 +02:00
ccf68878c7
Merge branch '6.0.x'
2023-06-12 16:12:03 +01:00
f7d195782f
Revert "Temporarily re-enable ReactorNetty2StompBrokerRelayIntegrationTests"
...
This reverts commit 7e52b803be
2023-06-12 16:11:42 +01:00
5bc80fc094
Disable SpEL selector support in WebSocket messaging by default
...
This commit disables support for evaluating SpEL expressions from
untrusted sources by default. Specifically, this applies to the
SpEL-based 'selector' header support in WebSocket messaging, which
includes the DefaultSubscriptionRegistry and the classes used to
configure the 'selector' header name (SimpleBrokerMessageHandler and
SimpleBrokerRegistration).
The selector header support remains in place but will have to be
explicitly enabled beginning with Spring Framework 6.1.
For example, a custom implementation of WebSocketMessageBrokerConfigurer
can override the configureMessageBroker() method and configure the
selector header name as follows.
registry.enableSimpleBroker().setSelectorHeaderName("selector");
Closes gh-30550
2023-06-04 17:02:02 +02:00
bedf5f26fe
Merge branch '6.0.x'
2023-06-04 16:27:23 +02:00
cc50af08e4
Enhance unit tests for status quo for SpEL 'selector' support in messaging
...
See gh-30550
2023-06-04 16:23:42 +02:00
d08e4081c2
Polishing
2023-06-04 15:59:12 +02:00
2685a35c3a
Merge branch '6.0.x'
2023-06-01 15:02:42 +02:00
21397a67c6
Test status quo for SpEL 'selector' support in messaging
...
Prior to this commit, the tests we had in place for SpEL 'selector'
support did not assert what happens when a selector expression does not
match or when a selector header is not present.
See gh-30550
2023-06-01 14:57:50 +02:00
e8ab53e76d
Polishing
2023-06-01 14:57:50 +02:00
ab253470f0
Update copyright headers
2023-05-23 15:12:32 +02:00
5236d17ac4
Re-enable flaky tests after bd66c70b
...
See gh-29287
2023-05-10 11:44:32 +01:00
d9f659171b
Merge branch '6.0.x'
2023-05-10 11:43:38 +01:00
bd66c70b2b
Potential fix for flaky STOMP integration tests
...
When ReactorNetty2StompBrokerRelayIntegrationTests fail, typically there
are multiple exceptions "Connection refused: /127.0.0.1:61613" that
appear after we've conneted, sent CONNECT, and expecting CONNECTED, but
that does not come within the 10 second timeout.
61613 is the default port for STOMP. However, in all integration tests
we start ActiveMQ with port 0 which results in a random port. Moreover,
the stacktrace is for Netty 4 (not 5), and the eventloop thread id's
are different than the one where the connection to the correct, random
port was established.
The suspicion is that these are log messages from
MessageBrokerConfigurationTests which focuses on testing configuration
but nevertheless as a bean starts and attempts to connect to the default
port and fails. Perhaps those attempts to connect on the default port
somehow affect the ActiveMQ server, and it stops responding.
This change adds a no-op TcpClient in MessageBrokerConfigurationTests
to avoid unnecessary attempts to connect that are not needed.
See gh-29287
2023-05-10 11:42:45 +01:00
73d30dd875
Polishing contribution
...
Closes gh-30403
2023-05-05 20:53:52 +01:00
033548a760
Remove default blockTimeout on interface clients
...
See gh-30403
2023-05-05 20:53:52 +01:00
b7884ddd02
Disable flaky ReactorNetty2StompBrokerRelayIntegrationTests
...
See gh-29287
2023-05-04 16:37:17 +02:00
d446de62a4
Update copyright headers
2023-04-19 15:55:11 +02:00
59c65fa940
Replace `Collections.unmodifiableList(new ArrayList(..))` with `List.copyOf()` ( #30166 )
2023-04-12 13:07:20 +02:00
33ef9107e0
Minor refactoring in PayloadMethodArgumentResolver
...
Closes gh-30168
2023-04-11 11:36:41 +01:00
1734deca1e
Refactor AssertJ assertions into more idiomatic ones
...
This commit refactors some AssertJ assertions into more idiomatic and
readable ones. Using the dedicated assertion instead of a generic one
will produce more meaningful error messages.
For instance, consider collection size:
```
// expected: 5 but was: 2
assertThat(collection.size()).equals(5);
// Expected size: 5 but was: 2 in: [1, 2]
assertThat(collection).hasSize(5);
```
Closes gh-30104
2023-04-04 17:34:07 +02:00
69c8f8e9c7
Update copyright headers
2023-04-03 16:45:49 +02:00
2184d4e80e
Fix incomplete assertions
...
Closes gh-30209
2023-03-28 10:56:41 +02:00
e17f5c50a8
Update copyright headers
2023-03-13 21:53:40 +01:00
00be19c647
Consistently declare Object::equals argument as @Nullable
2023-03-13 21:43:21 +01:00
a6338fcc43
Update copyright headers
2023-03-06 17:20:42 +01:00
004a144bdc
Apply "instanceof pattern matching" in remainder of spring-messaging module
...
See gh-30067
2023-03-06 16:23:10 +01:00
a936a6a8ce
Javadoc-only reference to SubscribeMapping from simp package (-> package dependency cycle)
...
See gh-30002
2023-03-02 13:57:17 +01:00
edb4a3467a
Update copyright headers
2023-02-26 18:37:18 +01:00
9305a64a50
Polish contribution
...
See gh-29994
2023-02-26 18:30:14 +01:00
40672c3715
Apply "instance of patten matching" in context and messaging modules
...
Closes gh-29994
2023-02-26 18:30:14 +01:00
626a7fc52a
Add native support for @SubscribeMapping and @MessageExceptionHandler
...
Closes gh-30002
2023-02-21 18:47:30 +01:00
2d56505ea9
Polishing
2023-02-20 16:49:27 +01:00
38a4f23f16
Polishing
2023-02-19 13:41:36 +01:00
ccbb4bdd27
PayloadMethodArgumentResolver supports Optional
...
Closes gh-28945
2023-02-13 18:39:19 +00:00
5b79a57f14
Polishing
...
See gh-28945
2023-02-13 18:39:19 +00:00
3e2f58cdd2
Offer restricted access to DataBuffer's ByteBuffer
...
This commit introduces DataBuffer::readableByteBuffers and
DataBuffer::writableByteBuffers, allowing restricted access to the
ByteBuffer used internally by DataBuffer implementations.
Closes gh-29943
2023-02-13 15:28:29 +01:00
97e557c886
Update copyright headers
2023-02-07 16:37:18 +01:00
ac6385025b
Polishing
2023-02-02 15:02:10 +01:00
4beb05ddb3
Add native support for RSocketExchange.
...
This commit introduces new AOT processors that look for
`@RSocketExchange` annotated methods on interfaces implemented by beans
and registers reachability metadata accordingly:
* JDK proxies for the beans themselves
* invocation reflection for annotated methods
* binding reflection for arguments and return types
This allows to compile such clients to Native Images.
Closes gh-29877
2023-02-01 18:22:33 +01:00
4d6249811e
Explicit target ClassLoader for interface-based infrastructure proxies
...
Includes direct JDK Proxy usage instead of ProxyFactory where possible.
Closes gh-29913
2023-01-31 16:11:34 +01:00
0502d18e3d
Update copyright headers
2023-01-19 16:20:03 +01:00
c4c786596f
Migrate to Mockito.mock(T...) where feasible
2023-01-19 16:20:02 +01:00
a12c9a0430
Update copyright headers
2023-01-16 19:24:30 +01:00
8be542016b
Apply "instanceof pattern matching" in spring-jms
2023-01-16 19:24:30 +01:00
a4956dfe26
Update copyright headers
2023-01-11 13:52:20 +01:00
0415975dd1
Polish contribution and related code
2023-01-11 13:52:20 +01:00
afb8a0d1b1
Use new Java features (switch expressions, text blocks, new JDK methods)
...
Closes gh-29747
2023-01-11 13:51:28 +01:00
5c28b56823
Remove duplicated words in Javadoc
2022-12-18 12:05:18 +01:00
46fc28fd1a
Clean up Javadoc and source code regarding " ." typos
2022-12-12 16:31:14 +01:00
ad60164911
Update copyright headers for source code changed since August 2022
...
The changes in this commit were performed using the newly introduced
update_copyright_headers.sh script.
2022-11-29 19:38:42 +01:00
a88dbbec98
Apply project formatting rules for ternary operator
...
Discovered via RegEx: ^\s+\?
2022-11-29 17:51:13 +01:00
a3c89092e1
Log connection info in StompBrokerRelayMessageHandler
...
See gh-29287
2022-11-23 13:58:37 +00:00
98c514ecbe
Increase logging for spring-messaging tests
...
See gh-29287
2022-11-22 20:52:50 +00:00
459e8a1ea5
Deprecate LocalVariableTableParameterNameDiscoverer completely
...
LocalVariableTableParameterNameDiscoverer is not registered by default anymore now.
Java sources should be compiled with `-parameters` instead (available since Java 8).
Also retaining standard Java parameter names for all of Spring's Kotlin sources now.
Closes gh-29531
2022-11-22 19:26:15 +01:00
7e52b803be
Temporarily re-enable ReactorNetty2StompBrokerRelayIntegrationTests
...
To see if it still fails on the CI server as it doesn't fail locally
for me, and if it does to get details to investigate.
See gh-29287
2022-11-22 16:42:57 +00:00
7fcd1de8e3
Use AssertJ's isEmpty() instead of hasSize(0)
...
Achieved via global search-and-replace.
2022-11-22 17:11:50 +01:00
d5b0b2b1a1
User AssertJ's hasSize() for arrays
...
Achieved via global search-and-replace.
2022-11-22 17:03:45 +01:00
36f7597f25
Use AssertJ's hasSize() for collections and maps
...
Achieved via a global search-and-replace.
2022-11-22 16:50:10 +01:00
0c878d2d06
Apply additional 'instanceof pattern matching' in spring-web
...
See gh-29530
2022-11-21 15:57:53 +01:00
792371ac1f
Generalize Jackson version numbers
...
This commit removes specific version info from Jackson codecs and
converters, in favor of generic info or removing the version information
all together.
See gh-29508
2022-11-17 16:56:38 +01:00
abf3400c07
Use Assert.state() where appropriate
2022-11-15 12:31:10 +01:00
eb91d21ada
Polishing
2022-11-13 18:21:56 +01:00
a9a78686ed
Merge branch '5.3.x'
...
# Conflicts:
# spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
2022-11-08 18:13:26 +01:00
55b258f2de
Avoid unnecessary allocations in StompDecoder#unescape
...
Closes gh-29443
2022-11-08 18:10:54 +01:00
3438c47744
Polishing
2022-11-08 11:48:13 +01:00
aeb35663d4
Remove deprecated methods in HttpServiceProxyFactory
2022-11-07 16:57:17 +00:00
ac5eb9bfd3
Avoid String allocations with Assert.isTrue()
2022-11-05 14:51:36 +01:00
82823517fa
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
# spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
# spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
# spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java
# spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java
# spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
# spring-web/src/main/java/org/springframework/http/HttpRange.java
# spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
# spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java
# spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/RedirectViewControllerRegistration.java
2022-11-05 14:50:18 +01:00
5f02323b9c
Avoid String allocations with Assert.isTrue()
2022-11-05 14:40:45 +01:00
2afcf60566
Avoid String allocations with Assert.state()
2022-11-04 16:44:59 +01:00
d849f9816a
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
# spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java
# spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
# spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java
2022-11-04 16:29:54 +01:00
a281d8c3fd
Polishing
2022-11-04 16:24:59 +01:00
5aeafc0761
Fix ISE in [Http|RSocket]ServiceProxyFactory
...
Closes gh-29376
2022-10-25 12:27:53 +01:00
d4f7484252
Add Builder to RSocketServiceProxyFactory
...
RSocketServiceProxyFactory now support programmatic initialization
through a builder, while bean-style initialization is deprecated.
Closes gh-29296
2022-10-19 14:36:45 +01:00
aa776e40f9
Ensure classpath checks can be evaluated at build-time
...
Closes gh-29352
2022-10-19 10:49:11 +02:00
ae368a20b8
Merge branch '5.3.x'
...
# Conflicts:
# spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt
# spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonEncoderTests.kt
2022-10-08 14:06:41 +02:00
1c1a0afbed
Use AssertJ static imports consistently in 5.3.x
...
Closes gh-29282
2022-10-08 13:57:21 +02:00
c1ff812d84
Disable flaky ReactorNetty2StompBrokerRelayIntegrationTests
...
See gh-29287
2022-10-08 13:43:09 +02:00
b5adae2086
Switch to Reactor Netty 2 snapshots
...
Update to Reactor BOM 2022.0.0-SNAPSHOT.
Process package changes.
Adapt to new `HttpHeaders` API.
Adapt to new cookies API.
See gh-29247
2022-10-03 18:20:52 +01:00
321092ce6f
Consistent use of @Deprecated(since = "6.0")
2022-09-20 14:34:24 +02:00
b87d48b99b
Merge branch '5.3.x'
2022-09-14 17:18:00 +02:00
ce49068ff9
Fix links in Javadoc and reference docs
...
- Fix broken links (by using a new URL, an alternative URL, or a
Wayback Machine link)
- Use HTTPS where possible
- Remove https://issuetracker.springsource.com/browse/EBR-349 : this
link is dead and is also mentioned in
https://jira.spring.io/browse/SPR-8093
- Clean up nohttp allowlist.lines
Closes gh-28876
2022-09-14 17:00:11 +02:00
8d92c57777
Merge branch '5.3.x'
...
# Conflicts:
# spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
2022-09-14 16:52:55 +02:00
Sébastien Deleuze
Juergen Hoeller
Sam Brannen
rstoyanchev
Atsushi Yoshikawa
Olga MaciaszekSharma
SW
divcon
Krzysztof Krasoń
Johnny Lim
Arjen Poutsma
Sam Brannen
Christoph Dreis
Violeta Georgieva
Marc Wrobel