Juergen Hoeller
49caa02584
Merge branch '6.1.x'
2024-05-24 13:06:21 +02:00
Juergen Hoeller
26d1c38d84
Polishing
2024-05-24 13:05:49 +02:00
Juergen Hoeller
dae4366325
Merge branch '6.1.x'
2024-05-24 11:55:53 +02:00
Juergen Hoeller
345daaabbc
Detect original generic method for CGLIB bridge method
...
Closes gh-32888
2024-05-24 11:49:10 +02:00
Stéphane Nicoll
ddf5521bc9
Merge branch '6.1.x'
2024-05-21 08:56:41 +02:00
Stéphane Nicoll
f26483d272
Detect deprecated element in generic types
...
This commit updates Spring AOT to suppress a deprecation warning for
a generic type that has a deprecated element. Previously we only were
checking for the raw class.
Closes gh-32850
2024-05-21 08:53:18 +02:00
Sébastien Deleuze
7985ab33f4
Throw an exception for suspending factory methods
...
Suspending factory methods are not supported, and can
have side effects, so it is better to fail explicitly
for such use case.
Closes gh-32719
2024-05-10 11:56:50 +02:00
Stéphane Nicoll
2d942a6e91
Merge branch '6.1.x'
2024-05-08 10:30:19 +02:00
Stéphane Nicoll
5b1278d03c
Refine exception message to include bean name
...
Closes gh-32775
2024-05-08 10:27:34 +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
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
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
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
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
c9e85ec297
Introduce callback for singleton availability
...
Closes gh-21362
2024-03-07 09:57:29 +01:00
Yanming Zhou
246ebd24bf
Add missing method BeanDefinitionBuilder.setFallback()
2024-02-29 13:34:55 +01:00
Juergen Hoeller
4d206f79d0
Merge branch '6.1.x'
...
# Conflicts:
# spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
2024-02-26 13:42:00 +01:00
Juergen Hoeller
479879c53a
Polishing
2024-02-26 13:40:21 +01:00
Juergen Hoeller
2e57603310
Try type conversion for unique fallback write method as well
...
Closes gh-32329
See gh-32159
2024-02-26 13:40:05 +01:00
Juergen Hoeller
567547b63c
Skip shortcut resolution for non-standard dependency descriptors
...
Closes gh-32326
See gh-28122
2024-02-24 18:05:23 +01:00
Sam Brannen
b0d08fe2d4
Spring cleaning: avoid deprecation warnings
2024-02-23 12:38:40 +01:00
Sam Brannen
4339c8eac2
Spring cleaning: use diamond operator
2024-02-23 12:20:11 +01:00
Sam Brannen
bfed6a3bc5
Clean up warnings in Gradle build
2024-02-21 16:22:38 +01:00
Juergen Hoeller
889c4e0ff5
Reject multiple primary candidates in ancestor factory as well
...
Closes gh-26612
2024-02-20 16:24:03 +01:00
Juergen Hoeller
4a02893c31
Avoid early singleton inference outside of original creation thread
...
See gh-23501
2024-02-19 17:44:30 +01:00
Juergen Hoeller
902e5707a8
Revise singleton registry for lenient locking (fallback instead of deadlock)
...
Closes gh-23501
2024-02-19 15:49:33 +01:00
Juergen Hoeller
c6146ea2db
Introduce shortcut for declared dependency name matching target bean name
...
Closes gh-28122
2024-02-16 21:28:04 +01:00
Sam Brannen
7c07c43201
Polishing
2024-02-16 15:00:06 +01:00
Yanming Zhou
615973cce4
Fix assertion in BeanWrapperAutoGrowingTests
...
See gh-32176
2024-02-01 09:34:32 +01:00
Juergen Hoeller
00577ed80a
Polishing
2024-01-31 17:12:20 +01:00
Juergen Hoeller
9b2b485444
Disabled test for auto-growing nested map values
...
See gh-32154
2024-01-31 17:12:12 +01:00
Juergen Hoeller
af5acb6d34
Avoid pre-conversion attempt in case of overloaded write methods
...
Closes gh-32159
See gh-31872
2024-01-30 21:57:14 +01:00
Stéphane Nicoll
0c42965fc3
Polish
2024-01-15 11:17:19 +01:00
Stéphane Nicoll
1f2d29ee08
Polish
2024-01-08 17:12:33 +01:00
Sam Brannen
4b6126c057
Polishing
2024-01-05 15:17:51 +01:00
Sam Brannen
476ef0c3ca
Introduce basic unit test for AutowiredAnnotationBeanPostProcessor.processInjection()
2024-01-05 13:22:29 +01:00
Stefano Cordio
be9ee9112c
Upgrade to AssertJ 3.25.1, use AssertJ BOM
...
Closes gh-31945
2024-01-04 09:55:12 +01:00
Sam Brannen
ffddbb586e
Upgrade to AssertJ 3.25.0
2024-01-02 16:45:04 +01:00
Stéphane Nicoll
9a1ee48d73
Merge pull request #31930 from izeye
...
* pr/31930:
Update copyright year of changed files
Polish
Closes gh-31930
2024-01-01 11:01:07 +01:00
Stéphane Nicoll
e22d1efdc0
Update copyright year of changed files
...
See gh-31930
2024-01-01 11:00:56 +01:00
