Juergen Hoeller
69eaf8f828
Merge branch '6.1.x'
2024-05-01 18:07:13 +02:00
Juergen Hoeller
25cedcfb99
Consistently propagate ApplicationStartup to BeanFactory
...
Closes gh-32747
2024-05-01 18:06:27 +02:00
Juergen Hoeller
f1a1190700
Merge branch '6.1.x'
...
# Conflicts:
# framework-docs/modules/ROOT/pages/data-access/transaction/declarative/annotations.adoc
2024-04-30 15:47:48 +02:00
Juergen Hoeller
cbda46984c
Polishing
2024-04-30 15:46:28 +02:00
Juergen Hoeller
dfc053ad65
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-04-29 18:05:40 +02:00
Juergen Hoeller
3cf2cd70ab
Polishing
2024-04-29 18:02:44 +02:00
Juergen Hoeller
0ac04a7f86
Include original exception message in dependency initialization exception
...
Closes gh-32470
2024-04-29 18:02:39 +02:00
Juergen Hoeller
0402ea13c0
Merge branch '6.1.x'
2024-04-24 13:42:43 +02:00
Juergen Hoeller
387e34d881
Wrap depends-on exception for specifically requested top-level bean
...
Closes gh-32470
2024-04-24 13:41:48 +02:00
Stéphane Nicoll
8124491249
Merge branch '6.1.x'
2024-04-22 17:01:04 +02:00
Stéphane Nicoll
c99e7f8616
Ignore InstanceSupplier for getBean with arguments
...
Previously, a BeanDefinition that has an instance supplier would be
used irrespective of custom arguments being provided. This commit only
applies the instance supplier if no arguments are provided. With
custom arguments, the regular lookup takes place based on the
information provided in the bean factory.
Closes gh-32657
2024-04-22 16:59:31 +02:00
Stéphane Nicoll
c21090ad31
Merge branch '6.1.x'
2024-04-22 15:16:50 +02:00
Stéphane Nicoll
8a8c8fe00e
Detect target of factory method with AOT
...
Previously, if a factory method is defined on a parent, the generated
code would blindly use the method's declaring class for both the target
of the generated code, and the signature of the method.
This commit improves the resolution by considering the factory metadata
in the BeanDefinition.
Closes gh-32609
2024-04-22 15:13:56 +02:00
Juergen Hoeller
e42c5ca52b
Merge branch '6.1.x'
2024-04-18 12:20:14 +02:00
Juergen Hoeller
0e0397a385
Polishing
2024-04-18 12:18:18 +02:00
Sam Brannen
69cb2a347a
Update copyright date
...
See gh-32647
2024-04-16 15:11:12 +02:00
janghs
0d4ef4eafe
Omit empty resource description in DeprecatedBeanWarner's log message
...
Closes gh-32647
2024-04-16 15:07:18 +02:00
Juergen Hoeller
4eb93da31d
Merge branch '6.1.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/GenericTypeAwareAutowireCandidateResolver.java
2024-04-08 22:41:02 +02:00
Juergen Hoeller
f2889b1b43
Consistent support for generic FactoryBean type matching
...
Closes gh-32590
See gh-32489
2024-04-08 22:39:29 +02:00
Juergen Hoeller
13df59cef4
Merge branch '6.1.x'
2024-04-08 09:52:42 +02:00
Juergen Hoeller
22328905da
Do not extract FactoryBean generic in case of targetType mismatch
...
Closes gh-32489
2024-04-08 09:51:59 +02:00
Sébastien Deleuze
0c42874629
Merge branch '6.1.x'
2024-04-05 14:33:20 +02:00
Sébastien Deleuze
4a7c24d90f
Refine null-safety
...
See gh-32475
2024-04-05 14:30:50 +02:00
Stéphane Nicoll
7a74e45946
Make use of bean definition overriding more visible
...
This commit makes the use of bean definition overriding more visible and
prepare for a deprecation of the feature in the next major release.
As of this commit, use of bean definition overriding logs at INFO level.
The previous log level can be restored by setting the
allowBeanDefinitionOverriding flag explicitly on the BeanFactory (or
via the related ApplicationContext).
A number of tests that are using bean overriding on purpose have been
updated to set this flag, which will make them easier to find once we
actually deprecate the feature.
Closes gh-31288
2024-04-02 14:05:12 +02:00
Sébastien Deleuze
5b660da52d
Perform NullAway build-time checks in more modules
...
This commit enables null-safety build-time checks in:
- spring-jdbc
- spring-r2dbc
- spring-orm
- spring-beans
- spring-aop
See gh-32475
2024-03-26 09:59:30 +01:00
Sébastien Deleuze
3b4f8dbb8e
Merge branch '6.1.x'
2024-03-26 09:47:09 +01:00
Sébastien Deleuze
1b563f8ba4
Refine null-safety in more modules
...
This commit refines the null-safety in:
- spring-jdbc
- spring-r2dbc
- spring-orm
- spring-beans
- spring-aop
See gh-32475
2024-03-26 09:46:34 +01:00
Felix
05b15812bb
Apply instanceof pattern matching in RootBeanDefinition
...
Closes gh-32520
2024-03-23 09:09:25 +01:00
Stéphane Nicoll
cf4ac96688
Merge branch '6.1.x'
2024-03-22 16:33:17 +01:00
Juergen Hoeller
e58ea0d945
Merge branch '6.1.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
2024-03-19 10:06:48 +01:00
Juergen Hoeller
c531a8a705
Nullability refinements and related polishing
...
See gh-32475
2024-03-19 09:58:44 +01:00
Sam Brannen
e1b1435a00
Stop referring to JDK 1.5 plus polishing
2024-03-14 16:00:51 +01:00
Sam Brannen
04e69bdb26
Polish contribution
...
Closes gh-32412
2024-03-11 17:04:53 +01:00
Mikaël Francoeur
3e48031601
Reject null return value from MethodReplacer for primitive return type
...
This commit throws an exception instead of silently converting a null
return value from a MethodReplacer to a primitive 0/false value.
See gh-32412
2024-03-11 17:04:53 +01:00
Sam Brannen
f285971cb3
Polishing
2024-03-11 17:04:53 +01:00
Stéphane Nicoll
e53ed3e3c6
Merge branch '6.1.x'
2024-03-09 16:03:04 +01:00
Stéphane Nicoll
4983a802a7
Polish "Fix Javadoc"
...
See gh-32403
2024-03-09 16:02:01 +01:00
Maksim Sasnouski
abdccffa39
Fix Javadoc
...
This commit fixes various Javadoc issues across the code base.
See gh-32403
2024-03-09 16:02:00 +01:00
Sam Brannen
20be9e150c
Polishing
2024-03-09 14:28:01 +01:00
Juergen Hoeller
fad544e077
Merge branch '6.1.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
2024-03-08 19:51:05 +01:00
Juergen Hoeller
c1287d48e2
Polishing
2024-03-08 19:31:01 +01:00
Sam Brannen
ae6c64abc5
Fix Javadoc errors
2024-03-08 11:59:53 +01:00
Juergen Hoeller
c9e85ec297
Introduce callback for singleton availability
...
Closes gh-21362
2024-03-07 09:57:29 +01:00
Juergen Hoeller
14a461e795
Consider type-level qualifier annotations for transaction manager selection
...
Closes gh-24291
2024-03-06 13:36:33 +01:00
Juergen Hoeller
b5ca646431
Leniently tolerate late bean retrieval during destroySingletons()
...
Closes gh-22526
Closes gh-29730
2024-03-04 17:21:02 +01:00
Yanming Zhou
246ebd24bf
Add missing method BeanDefinitionBuilder.setFallback()
2024-02-29 13:34:55 +01:00
Sébastien Deleuze
7c5bcbcba4
Merge branch '6.1.x'
2024-02-28 17:24:08 +01:00
Sébastien Deleuze
45c21042f6
Optimize Kotlin inline class checks
...
This commit fixes a performance regression caused by gh-31698,
and more specifically by KClass#isValue invocations which are slow since
they load the whole module to find the class to get the descriptor.
After discussing with the Kotlin team, it has been decided that only
checking for the presence of `@JvmInline` annotation is enough for
Spring use case.
As a consequence, this commit introduces a new
KotlinDetector#isInlineClass method that performs such check, and
BeanUtils, CoroutinesUtils and WebMVC/WebFlux InvocableHandlerMethod
have been refined to leverage it.
Closes gh-32334
2024-02-28 17:18:57 +01:00
Juergen Hoeller
aeb77cf4e1
Restore correct threadWithLock check without isInfoEnabled()
...
See gh-23501
2024-02-28 11:47:39 +01:00
Juergen Hoeller
17b2087198
Introduce background bootstrapping for individual singleton beans
...
Closes gh-13410
Closes gh-19487
See gh-23501
2024-02-27 22:33:18 +01:00
