4e2d5d4d64
Merge branch '6.2.x'
2025-10-03 14:18:24 +02:00
1cdd56bf02
Log multiple primary bean detection in DefaultListableBeanFactory
...
Prior to this commit, a NoUniqueBeanDefinitionException was thrown when
multiple primary beans were detected within a given set of beans, but
nothing was logged. For use cases where the exception is handled by
infrastructure code, it may not be obvious to the developer what the
problem is.
To address that, a TRACE message is now logged whenever multiple
competing primary beans are detected in DefaultListableBeanFactory.
Closes gh-35550
2025-10-03 14:09:52 +02:00
8a719117e3
Fix copy-paste error from recent change
...
See gh-35562
2025-10-03 09:21:55 +01:00
37319fc367
Merge branch '6.2.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/cglib/core/CodeEmitter.java
2025-10-02 21:56:12 +02:00
3041071269
Consistently apply useCaches for single Resource lookup
...
Closes gh-35465
2025-10-02 21:53:47 +02:00
2da821389c
Remove redundant object allocation in cglib proxy method calls
...
Reformatted with Spring patch markers and backported to 6.2.12
Closes gh-35543
2025-10-02 21:53:34 +02:00
b4d501f888
Remove redundant object allocation in cglib proxy method calls
...
* Fixes gh-35542
Signed-off-by: Nurlan Turdaliev <nurlan0000@gmail.com >
2025-10-02 21:22:19 +02:00
8631345b71
Refine Jackson 3 vs 2 setup in CodecConfigurer
...
Closes gh-35562
2025-10-02 17:35:33 +01:00
1333669e2c
Introduce SimpleDestinationResolver as new default for common setups
...
Closes gh-35456
2025-10-02 18:28:59 +02:00
c5a79fdf99
Stop using javadoc.io for external Javadoc links
...
Since our build was failing intermittently, we have decided to stop
using javadoc.io for external Javadoc links for the time being.
2025-10-02 14:24:09 +02:00
7089bdcc3a
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
2025-10-02 13:17:45 +02:00
d484e4f3ff
Ignore SQL state 3B001 in releaseSavepoint (for HSQLDB)
...
Closes gh-35564
2025-10-02 13:01:30 +02:00
74dc61b8c4
Fall back to local synchronization in getObjectFromFactoryBean
...
Closes gh-35545
2025-10-02 13:01:03 +02:00
c08610ee58
Revert nullability changes in reactive transaction support
...
After further consideration, we have decided to revert the
nullability changes in the reactive TransactionCallback and
TransactionalOperator.
See gh-35561
2025-10-02 12:47:37 +02:00
1e83de072c
Merge branch '6.2.x'
2025-10-02 11:45:43 +02:00
717358b56b
Short circuit ClassUtils.findPubliclyAccessibleMethodIfPossible(...)
...
Once we find a publicly accessible method, there is no need to continue
traversing the type hierarchy.
See gh-35556
2025-10-02 11:44:54 +02:00
1243f40ee6
Merge branch '6.2.x'
2025-10-02 10:20:09 +02:00
836634c47f
Upgrade CI workflow from Java 24 to Java 25
2025-10-02 10:19:42 +02:00
e91abd442a
Simplify MockHttpServletRequestBuilders hierarchy
...
Closes gh-33231
2025-10-02 09:22:33 +02:00
d98179e137
Enforce custom string converter in HttpMessageConverters
...
Prior to this commit, configuring a custom `StringHttpMessageConverter`
would be overwritten when the `registerDefaults()` option is enabled.
Fixes gh-35563
2025-10-01 20:18:39 +02:00
56b082dec7
Merge branch '6.2.x'
2025-10-01 19:58:49 +02:00
a6f6ecfe6c
Revise getPubliclyAccessibleMethodIfPossible to rely on Module#isExported
...
This avoids reflection and cache access for regular public and exported types.
Closes gh-35556
2025-10-01 19:56:23 +02:00
e3da26ebbd
Clarify event parameter type for multiple mapped classes
...
Closes gh-35506
2025-10-01 19:55:42 +02:00
b59fec21d8
Merge branch '6.2.x'
2025-10-01 19:41:22 +02:00
e1c008f5a3
Fix URI Patterns docs for WebMVC and WebFlux
...
Closes gh-35551
Signed-off-by: Maziyar Bahramian <maziyar.bahramian@gmail.com >
2025-10-01 19:39:57 +02:00
acc3783509
Merge branch '6.2.x'
2025-10-01 19:26:06 +02:00
cb849a7071
Add a test for CGLIB Enhancer Kotlin refinements
...
This commit adds a reproducer for the change of behavior introduced via
https://youtrack.jetbrains.com/issue/KT-76667 . The test is only broken
with Kotlin 2.2.20+ without the related fix (see previous commit).
Closes gh-35487
2025-10-01 19:21:40 +02:00
3e37279db6
Make CGLIB Enhancer compatible with Kotlin 2.2.20+
...
This commit refines Enhancer#emitMethods to support the changes
introduced by https://youtrack.jetbrains.com/issue/KT-76667 .
See gh-35487
2025-10-01 19:14:14 +02:00
c765b035e5
Merge branch '6.2.x'
2025-10-01 16:14:13 +01:00
b3264ec2a8
Fix typo
2025-10-01 16:13:40 +01:00
563919befd
Revise nullability of Transaction[Callback|Operations|Operator]
...
This commit revises the nullability declarations in TransactionCallback,
TransactionOperations, and TransactionalOperator.
Closes gh-35561
2025-10-01 16:58:33 +02:00
f071f95899
Merge branch '6.2.x'
2025-10-01 14:46:47 +01:00
df860fd3cd
Polishing contribution
...
Closes gh-35493
2025-10-01 14:45:18 +01:00
636523a2f5
AbstractMockHttpServletRequestBuilder#buildRequest is not idempotent
...
See gh-35493
Signed-off-by: Réda Housni Alaoui <reda-alaoui@hey.com >
2025-10-01 14:44:23 +01:00
a19b51b7e0
Handle invalid position in ResourceHttpMessageWriter
...
Closes gh-35536
2025-10-01 14:44:05 +01:00
fbdece6759
Polishing in ResourceHttpMessageWriter
...
See gh-35536
2025-10-01 14:42:01 +01:00
96e90e10b9
Merge branch '6.2.x'
2025-10-01 13:21:05 +02:00
64d42fefda
Fix idref example in reference manual
...
Closes gh-35560
2025-10-01 13:19:54 +02:00
447cfa18e9
Polishing
2025-10-01 13:19:25 +02:00
5138305e0b
Fix SingletonSupplier.ofNullable(T) nullability
...
See gh-35559
2025-10-01 12:01:17 +02:00
48ec990a17
Fix typos
2025-10-01 11:53:01 +02:00
1e3f8651b8
Refine SingletonSupplier<T> static methods nullability
...
SingletonSupplier<T> supplier-based static methods nullability should
be refined to accept in a flexible way nullable or non-nullable T.
Closes gh-35559
2025-10-01 11:38:33 +02:00
a2c0e1cec8
Fix typos
2025-10-01 11:23:00 +02:00
8cad5711f5
Add Kotlin extensions for RestTestClient
...
Closes gh-35558
2025-10-01 10:56:34 +02:00
741107969a
Always invoke ConfigurationBeanNameGenerator
...
Previously, if a ConfigurationBeanNameGenerator is used to parse
configuration classes, it is not invoked for `Bean` methods that provide
a specific bean name. This doesn't give a chance to an implementation to
tune such a bean, if required.
This commit updates the signature of ConfigurationBeanNameGenerator to
provide the identified bean name on the `@Bean` declaration,if any, and
to always invoke it.
Closes gh-35505
2025-10-01 10:34:38 +02:00
969517bce1
Upgrade to JUnit 6.0
...
Closes gh-35124
2025-09-30 13:27:47 +02:00
834755203e
Merge branch '6.2.x'
2025-09-30 12:46:33 +02:00
ec3d9d6253
Upgrade to JUnit 5.14
...
Closes gh-35555
2025-09-30 12:43:53 +02:00
2bd6422db9
Update @ConcurrencyLimit documentation
...
This commit updates the reference manual in order to reflect recent
changes made to @ConcurrencyLimit.
See gh-35461
See gh-35470
See gh-35523
2025-09-29 17:41:59 +02:00
b9e0a48e95
Revise documentation for @Retryable
2025-09-29 17:38:50 +02:00
Sam Brannen