Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,987 Commits 18 Branches 0 Tags
c23795a8a6af02a18cdac19f325e2f5e91209d4e
Commit Graph

1335 Commits

Author SHA1 Message Date
Sam Brannen
b6fdfe8ee3 Remove duplicated terms in documentation 
... using the following RegEx to find them:

(?<!\S)(\w+)(?:\s+\1)+(?!\S)
 2023-09-12 19:00:28 +02:00
Sébastien Deleuze
5fd356e44f Remove outdated @Suppress("DEPRECATION") annotations 
See gh-31127
 2023-09-08 13:18:16 +02:00
Sébastien Deleuze
6f38e90048 Merge branch '6.0.x' 2023-09-08 13:08:14 +02:00
Sébastien Deleuze
12a01a680b Document some non-nullable Kotlin extensions can throw NoSuchElementException 
Closes gh-31189
 2023-09-08 13:07:58 +02:00
Sam Brannen
fad70aa252 Update copyright headers 2023-09-04 14:30:44 +02:00
Sébastien Deleuze
bcf11e8919 Replace Reactive awaitSingle() usages by the Mono variant 
Closes gh-31127
 2023-08-29 09:49:44 +02:00
Juergen Hoeller
86a101ac2b Merge branch '6.0.x' 2023-08-16 12:48:43 +02:00
Juergen Hoeller
c7269feeaa Align validation metadata handling in PayloadMethodArgumentResolver 
Reuses ValidationAnnotationUtils which is slightly optimized for the detection of Spring's Validated annotation now, also to the benefit of common web scenarios.

Closes gh-21852
 2023-08-16 12:48:06 +02:00
Juergen Hoeller
45c20e34e4 Merge branch '6.0.x' 
# Conflicts:
#	spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
 2023-08-14 19:29:14 +02:00
Juergen Hoeller
2ce75dc415 Polishing 2023-08-14 19:28:19 +02:00
Juergen Hoeller
4e863c5a75 Merge branch '6.0.x' 2023-08-04 02:40:17 +02:00
Juergen Hoeller
18966d048c Consistent equals/hashCode style (and related polishing) 2023-08-04 02:39:31 +02:00
Juergen Hoeller
d250a5155a Consistent dependency declarations 2023-08-02 00:56:50 +02:00
Juergen Hoeller
3b1af692cc Merge branch '6.0.x' 
# Conflicts:
#	spring-beans/spring-beans.gradle
#	spring-context/spring-context.gradle
#	spring-orm/spring-orm.gradle
#	spring-test/spring-test.gradle
#	spring-web/spring-web.gradle
#	spring-webflux/spring-webflux.gradle
 2023-08-02 01:04:31 +02:00
Sam Brannen
525621c4d8 Polish contribution 
See gh-30710
 2023-08-01 11:19:54 +03:00
Patrick Strawderman
01e90bbd0e Use Long.parseLong(CharSequence,...) to avoid intermediate String creation 
Where possible, switch to the Long.parseLong variant that accepts a
start and end index for the supplied CharSequence, thus avoiding making
unnecessary copies of the String input.

Closes gh-30710
 2023-08-01 10:53:30 +03:00
rstoyanchev
5b6c127283 Polishing 
Closes gh-30936
 2023-07-28 12:46:58 +03:00
Olga MaciaszekSharma
4cd9e2e9b0 Support @RSocketExchange for annotated responders 
See gh-30936
 2023-07-28 04:23:00 +03:00
Juergen Hoeller
25ea1f4c0f Merge branch '6.0.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
 2023-07-19 00:37:06 +02:00
Juergen Hoeller
2f33e77ab4 Consistent equals/hashCode style (and related polishing) 2023-07-19 00:35:19 +02:00
Juergen Hoeller
d24c131130 Expose convert(Object, TypeDescriptor) in ConversionService interface 
Closes gh-25394
 2023-07-14 11:49:26 +02:00
Sébastien Deleuze
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
Sébastien Deleuze
b3de1b8e95 Use consistently *KotlinTests naming for Kotlin tests 
Closes gh-30837
 2023-07-08 11:02:20 +02:00
Juergen Hoeller
c1a8b9a14d Polishing 2023-07-04 21:24:35 +02:00
Juergen Hoeller
6526e79eea Polishing 2023-06-26 19:28:38 +02:00
Sébastien Deleuze
d3a249e34d Reduce the delay used for Coroutines in tests 
Closes gh-30731
 2023-06-23 14:17:56 +02:00
Sébastien Deleuze
76f94e998e Merge branch '6.0.x' 2023-07-09 18:41:58 +02:00
Sébastien Deleuze
8fb412ea74 Merge branch '6.0.x' 2023-07-08 11:11:37 +02:00
Juergen Hoeller
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
Juergen Hoeller
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
Juergen Hoeller
3f40452511 Merge branch '6.0.x' 2023-06-26 19:36:20 +02:00
Sébastien Deleuze
35667e81ea Merge branch '6.0.x' 2023-06-23 14:20:13 +02:00
Sam Brannen
06b6c4bcf9 Update copyright headers 2023-06-22 14:56:09 +02:00
rstoyanchev
db19f6395d Polishing 
Closes gh-29768
 2023-06-20 17:18:40 +01:00
Atsushi Yoshikawa
b677ff20fe AbstractMessageConverter delegates null headers 
See gh-29768
 2023-06-20 17:18:40 +01:00
rstoyanchev
b98c1ec36a Apply default value in case of null after conversion 
Closes gh-29550
 2023-06-20 17:18:40 +01:00
Sam Brannen
526d9eae7f Merge branch '6.0.x' 2023-06-15 16:20:19 +02:00
Sam Brannen
4565bcd757 Update copyright headers 2023-06-15 16:19:58 +02:00
rstoyanchev
ccf68878c7 Merge branch '6.0.x' 2023-06-12 16:12:03 +01:00
rstoyanchev
f7d195782f Revert "Temporarily re-enable ReactorNetty2StompBrokerRelayIntegrationTests" 
This reverts commit 7e52b803be.
 2023-06-12 16:11:42 +01:00
Sam Brannen
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
Sam Brannen
bedf5f26fe Merge branch '6.0.x' 2023-06-04 16:27:23 +02:00
Sam Brannen
cc50af08e4 Enhance unit tests for status quo for SpEL 'selector' support in messaging 
See gh-30550
 2023-06-04 16:23:42 +02:00
Sam Brannen
d08e4081c2 Polishing 2023-06-04 15:59:12 +02:00
Sam Brannen
2685a35c3a Merge branch '6.0.x' 2023-06-01 15:02:42 +02:00
Sam Brannen
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
Sam Brannen
e8ab53e76d Polishing 2023-06-01 14:57:50 +02:00
Sam Brannen
ab253470f0 Update copyright headers 2023-05-23 15:12:32 +02:00
rstoyanchev
5236d17ac4 Re-enable flaky tests after bd66c70b 
See gh-29287
 2023-05-10 11:44:32 +01:00
rstoyanchev
d9f659171b Merge branch '6.0.x' 2023-05-10 11:43:38 +01:00