b58c1c0d63
Assert actual Reactive exception types thrown in ReactiveRetryInterceptorTests
2025-07-02 11:27:50 +02:00
191d092952
Polishing
2025-07-02 11:26:34 +02:00
46654a03fe
Replace lenient fallback with assertion for actual annotation present
...
See gh-35133
2025-07-02 11:09:53 +02:00
b794abd8cb
Polishing
2025-07-02 10:58:50 +02:00
95c35e9655
Fix javadoc links to @Retryable
...
See gh-34529
See gh-35133
2025-07-01 18:00:59 +02:00
95a6a0ceaf
Merge branch '6.2.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/format/datetime/standard/DurationFormatterUtils.java
2025-07-01 17:57:49 +02:00
15364cf59f
Polishing
2025-07-01 17:51:23 +02:00
cc31bf3c33
Accept zero for RetryPolicy.Builder.delay()
...
This aligns the programmatic RetryPolicy configuration option with the
delay support in @Retryable.
See gh-35110
2025-07-01 17:40:15 +02:00
c9078bfe14
Introduce @ConcurrencyLimit annotation based on ConcurrencyThrottleInterceptor
...
Moves @Retryable infrastructure to resilience package in spring-context module.
Includes duration parsing and placeholder resolution for @Retryable attributes.
Provides convenient @EnableResilientMethods for @Retryable + @ConcurrencyLimit.
Closes gh-35133
See gh-34529
2025-07-01 17:27:50 +02:00
ec16b03949
Support navigation to failed tests in @Inject TCK tests
...
See gh-35126
2025-06-29 15:55:07 +02:00
ed86daa080
Convert Spring @Inject TCK tests from JUnit 3 to JUnit Jupiter
...
Closes gh-35126
2025-06-28 19:29:49 +02:00
841d9fb73b
Add public method to get bean order on DefaultListableBeanFactory
...
Closes gh-34712
2025-06-26 14:48:07 +02:00
543314fcbb
Polishing
2025-06-25 18:07:24 +02:00
90c875144a
Merge branch '6.2.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java
# spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java
# spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateQueryException.java
2025-06-24 22:01:58 +02:00
b6aa6899a8
Polishing
2025-06-24 21:58:39 +02:00
4190209ead
Add missing AOT support for method overrides (including @Lookup)
...
Closes gh-34642
2025-06-24 21:58:31 +02:00
294406dae9
Remove @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
...
Fixed in Kotlin 2.2.0 and IntelliJ IDEA IDEA 2024.2 EAP, see
https://youtrack.jetbrains.com/issue/KT-75169 related issue.
See gh-34453
2025-06-24 11:40:23 +02:00
a265a135d5
Align package namespace in TaskManagementConfigUtils constants
2025-06-18 12:24:02 +02:00
6927e39e6b
Merge branch '6.2.x'
2025-06-18 12:23:07 +02:00
00399dc1b3
Reject null for returned CompletableFuture (avoiding subsequent NPE)
...
See gh-34708
2025-06-18 12:20:19 +02:00
74ee1b991a
Apply consistent copyright headers in Kotlin source code
...
See gh-35070
2025-06-17 16:24:15 +02:00
16edf9867a
Update copyright headers in source files
...
This commit updates Java, Kotlin, and Groovy source files to use the
"<year>-present" pattern in copyright headers.
Closes gh-35070
2025-06-17 16:23:50 +02:00
103a7e58bb
Apply consistent copyright headers in Kotlin source code
...
See gh-35070
2025-06-17 15:54:58 +02:00
aee29b7f30
Update copyright headers in source files
...
This commit updates Java, Kotlin, and Groovy source files to use the
"<year>-present" pattern in copyright headers.
Closes gh-35070
2025-06-17 15:54:58 +02:00
0d4dfb6c1f
Rename exception variables in empty catch blocks
...
The Spring codebase sometimes ignores exceptions in catch blocks on
purpose. This is often called out by an inline comment.
We should make this more obvious by renaming the exception argument in
the catch block to declare whether the exception is "ignored" or
"expected".
See gh-35047
Signed-off-by: Vincent Potucek <vpotucek@me.com >
[brian.clozel@broadcom.com: rework commit message]
Signed-off-by: Brian Clozel <brian.clozel@broadcom.com>
2025-06-15 16:11:42 +02:00
077146d636
Merge branch '6.2.x'
2025-06-09 14:12:45 +02:00
18d6a55e3e
Polishing and removal of "this." for method invocations
2025-06-09 14:10:30 +02:00
ad2931b51f
Migrate away from AssertJ's catchThrowable()
...
Closes gh-35003
2025-06-06 15:01:26 +02:00
7f6a7b806e
Replace AssertionsForClassTypes with Assertions
...
Closes gh-34821
Signed-off-by: Johnny Lim <izeye@naver.com >
2025-06-06 13:49:23 +02:00
8d17afc28b
Merge branch '6.2.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2025-06-06 09:25:25 +02:00
d9c103b7ff
Remove unnecessary fallback to DefaultConversionService
...
See gh-34936
2025-06-06 09:21:21 +02:00
7e035f5c50
Polish ImportTests
2025-06-04 17:00:10 +02:00
4581324038
Polish support for @Import on interfaces
...
- Update @Import Javadoc
- Move tests from ImportSelectorTests to ImportTests
See gh-34820
2025-06-04 16:59:46 +02:00
a4d5800a6c
Support @Import on interfaces
...
See gh-34805
Closes gh-34820
Signed-off-by: Daeho Kwon <trewq231@naver.com >
2025-06-04 16:47:50 +02:00
686705140e
Polish Javadoc for @Import
2025-06-04 16:47:50 +02:00
230540b6da
Polishing contribution
...
Closes gh-34942
2025-06-04 13:46:22 +01:00
f9fa7cc93b
Add missing "since" in @Deprecated
...
See gh-34942
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com >
2025-06-04 13:46:22 +01:00
b699b65b40
Merge branch '6.2.x'
2025-06-03 19:11:52 +01:00
3f0892b42c
Fix typos
...
Closes gh-34876
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com >
2025-06-03 18:55:15 +01:00
c5566c947c
Merge branch '6.2.x'
2025-05-30 14:55:22 +02:00
016294b067
Avoid overriding methods deprecated in JUnit Jupiter 5.13
...
See gh-34969
2025-05-30 14:54:57 +02:00
e03117c9d2
Merge branch '6.2.x'
2025-05-27 11:28:48 +02:00
90be94a4a5
Use ConversionService from Environment in PropertySourcesPlaceholderConfigurer
...
This commit fixes a regression in PropertySourcesPlaceholderConfigurer
that was introduced in Spring Framework 6.2.7.
Specifically, this commit reinstates automatic String-conversion of
values from PropertySources in the Environment using the
ConversionService configured in the Environment.
See gh-34861
Closes gh-34936
2025-05-27 11:20:09 +02:00
cdfe0895f9
Merge branch '6.2.x'
2025-05-27 09:57:01 +02:00
15d1455acb
Check for package-visible constructor in case of ClassLoader mismatch
...
Closes gh-34950
2025-05-27 09:47:29 +02:00
5d166f4932
Merge branch '6.2.x'
2025-05-26 18:19:29 +02:00
53844b068c
Test conversion support in PropertySourcesPlaceholderConfigurer
...
This commit introduces a @Disabled "regression test" which demonstrates
that PropertySourcesPlaceholderConfigurer uses the ConversionService
from the Environment.
See gh-34936
2025-05-26 18:18:52 +02:00
6f6e0d45a9
Merge branch '6.2.x'
2025-05-26 17:37:08 +02:00
d78264756e
Support only Object property values in MockEnvironment test fixture
...
The setProperty() and withProperty() methods in MockEnvironment were
originally introduced with (String, String) signatures; however, they
should have always had (String, Object) signatures in order to comply
with the MockPropertySource and PropertySource APIs.
To address that, this commit changes the signatures of these methods so
that they only accept Object values for properties.
NOTE: this commit only affects the internal MockEnvironment used as a
test fixture. This commit does not affect the official, public
MockEnvironment implementation in spring-test.
See gh-34947
See gh-34948
2025-05-26 17:29:16 +02:00
eed0a3ff59
Allow access to env from SupplierContextDsl
...
Closes gh-34943
2025-05-26 11:55:34 +02:00
Sam Brannen