Juergen Hoeller
ac7c7ff5b2
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
2025-03-28 20:47:57 +01:00
Juergen Hoeller
75e5a75da5
Enforce circular reference exception within non-managed thread
...
Closes gh-34672
2025-03-28 20:46:09 +01:00
Juergen Hoeller
9bf01df230
Evaluate lenientLockingAllowed flag per DefaultListableBeanFactory instance
...
See gh-34303
2025-03-28 20:45:06 +01:00
Stéphane Nicoll
7ab108a321
Merge branch '6.2.x'
2025-03-27 12:12:54 +01:00
Stéphane Nicoll
2862c87601
Make sure the generated values are available from a static context
...
This commit updates the tests of property values code generated to
invoke the generated code from a `static` context. This ensures that
the test fails if that's not the case.
This commit also updated LinkedHashMap handling that did suffer from
that problem.
Closes gh-34659
2025-03-27 12:06:18 +01:00
Juergen Hoeller
f55ca3058b
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
2025-03-26 23:49:54 +01:00
Juergen Hoeller
aa56b5001a
Detect late-set primary markers for autowiring shortcut algorithm
...
Closes gh-34658
2025-03-26 23:47:42 +01:00
Juergen Hoeller
3872c1a762
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
# spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
# spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
2025-03-25 17:13:02 +01:00
Juergen Hoeller
6905dff660
Introduce spring.locking.strict=true flag for 6.1.x style bean creation locking
...
Closes gh-34303
2025-03-25 17:08:55 +01:00
Brian Clozel
fb423d66e3
Add ClassFile variant for class metadata reading
...
Prior to this commit, Spring Framework would use its own ASM fork to
read class/method/annotation metadata from bytecode. This is typically
used in configuration class parsing to build bean definitions without
actually loading classes at runtime at that step.
This commit adds support for a new metadata reading implementation that
uses the ClassFile API available as of Java 24. For now, this is turned
on by default for Java 24+.
Closes gh-33616
2025-03-25 15:33:53 +01:00
Juergen Hoeller
7d0cc6c83a
Merge branch '6.2.x'
2025-03-25 00:11:30 +01:00
Juergen Hoeller
37fb79e8ff
Fix qualifier resolution for aliased name against parent factory
...
Closes gh-34644
2025-03-25 00:08:42 +01:00
Juergen Hoeller
58246ec5ec
Merge branch '6.2.x'
2025-03-21 15:54:43 +01:00
Juergen Hoeller
dc41ff569e
Add javadoc notes on potential exception suppression in getBeansOfType
...
Closes gh-34629
2025-03-21 15:52:42 +01:00
Sébastien Deleuze
5ce64f47b2
Add support for ImportAware in BeanRegistrar
...
Closes gh-34627
2025-03-21 11:49:15 +01:00
Juergen Hoeller
47651350f3
Polishing
2025-03-21 10:58:40 +01:00
Sam Brannen
6505c4b839
Refine use of isArray() and componentType()
2025-03-20 17:28:37 +01:00
Sam Brannen
8db1340263
Merge branch '6.2.x'
2025-03-19 16:24:18 +01:00
Sam Brannen
208d52d852
Introduce Checkstyle rule for separator symbol location
2025-03-19 15:35:44 +01:00
Sébastien Deleuze
2f8c5a580a
Polishing
2025-03-19 15:11:43 +01:00
Sébastien Deleuze
2bc213d703
Allow registering aliases with BeanRegistry
...
Closes gh-34599
2025-03-19 15:11:32 +01:00
Juergen Hoeller
69ed984a81
Merge branch '6.2.x'
2025-03-18 16:11:38 +01:00
Juergen Hoeller
ad949a7450
Add includeNonSingletons flag for ObjectProvider stream access
...
Closes gh-34591
2025-03-18 16:10:30 +01:00
Juergen Hoeller
d2a8b56742
Merge branch '6.2.x'
2025-03-13 18:49:30 +01:00
Juergen Hoeller
911cdb2ad0
Add resolveAutowireCandidates variant with includeNonSingletons and allowEagerInit
...
Closes gh-34591
2025-03-13 18:48:43 +01:00
Sébastien Deleuze
1eec0382d7
Polishing
...
See gh-34557
2025-03-12 12:35:30 +01:00
Sébastien Deleuze
762831e742
Add BeanRegistrarDsl.register
...
See gh-34557
2025-03-12 12:34:04 +01:00
Juergen Hoeller
86b21d9b5c
Add support for BeanRegistrar registration on GenericApplicationContext
...
Closes gh-34574
2025-03-11 21:18:20 +01:00
Sébastien Deleuze
91d0ebe327
Refine BeanRegistryAdapterTests
...
Closes gh-34557
2025-03-10 10:39:21 +01:00
Phillip Webb
789791e186
Allow chained BeanRegistry registration
...
Add a `register(BeanRegistry registry)` method to `BeanRegistry`
to allow registration chaining.
See gh-34557
2025-03-10 10:38:50 +01:00
Sébastien Deleuze
a0e2d3a221
Add support for target type to BeanRegistry
...
Closes gh-34560
2025-03-10 10:14:28 +01:00
Juergen Hoeller
c74f897fac
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
2025-03-08 12:23:43 +01:00
Juergen Hoeller
143985e862
Add tests for primary/fallback/defaultCandidate precedence
...
Closes gh-34449
2025-03-08 12:22:14 +01:00
Juergen Hoeller
4bd280b87e
Explain availability and uniqueness (including primary/fallback/default) in javadoc
...
Closes gh-34447
2025-03-08 12:22:04 +01:00
Yanming Zhou
639af7befa
Add tests to ensure bean definition flag "fallback" take precedence over "defaultCandidate"
...
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com >
2025-03-08 12:21:31 +01:00
Sébastien Deleuze
fda9b9a696
Polishing
...
See gh-18353
2025-03-07 09:00:06 +01:00
Sébastien Deleuze
682e2d6d84
Introduce BeanRegistrarDsl
...
This commit introduces a new BeanRegistrarDsl that supersedes
BeanDefinitionDsl which is now deprecated.
See BeanRegistrarDslConfigurationTests for a concrete example.
See gh-18353
2025-03-06 19:15:56 +01:00
Sébastien Deleuze
496be9ca98
Introduce first-class support for programmatic bean registration
...
This commit introduces a new BeanRegistrar interface that can be
implemented to register beans programmatically in a concise and
flexible way.
Those bean registrar implementations are typically imported with
an `@Import` annotation on `@Configuration` classes.
See BeanRegistrarConfigurationTests for a concrete example.
See gh-18353
2025-03-06 19:14:03 +01:00
Juergen Hoeller
a605f07100
Merge branch '6.2.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
2025-03-05 22:47:24 +01:00
Juergen Hoeller
f3b50c9a58
Ignore null beans in SimpleAutowireCandidateResolver.resolveAutowireCandidates
...
Closes gh-34543
2025-03-05 22:44:09 +01:00
Juergen Hoeller
2fbd54078b
Merge branch '6.2.x'
...
# Conflicts:
# spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
# spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
2025-03-04 18:46:39 +01:00
Juergen Hoeller
403362fe3c
Polishing
2025-03-04 18:44:56 +01:00
Juergen Hoeller
533ecf0244
Merge branch '6.2.x'
2025-03-01 22:21:39 +01:00
Juergen Hoeller
d2733cea36
Notify lenientCreationFinished condition after locked creation as well
...
Closes gh-34522
2025-03-01 22:20:23 +01:00
Juergen Hoeller
2e4fbd1ff3
Merge branch '6.2.x'
2025-02-18 13:14:38 +01:00
Juergen Hoeller
e230ea537c
Consistently resolve unique default candidate bean
...
Closes gh-34432
2025-02-18 13:11:36 +01:00
Juergen Hoeller
94eb6006e8
Leniently accept same singleton instance if implicitly appeared
...
Closes gh-34427
2025-02-18 13:01:08 +01:00
Juergen Hoeller
9bc7229a1c
Merge branch '6.2.x'
2025-02-12 23:07:37 +01:00
Juergen Hoeller
dfc10c1a8d
Wait for lenient bean creation in non-locked threads as well
...
Closes gh-34349
2025-02-12 23:06:22 +01:00
Juergen Hoeller
b07ff1c2d4
Merge branch '6.2.x'
2025-02-12 12:17:54 +01:00
