Sam Brannen
077146d636
Merge branch '6.2.x'
2025-06-09 14:12:45 +02:00
Sam Brannen
18d6a55e3e
Polishing and removal of "this." for method invocations
2025-06-09 14:10:30 +02:00
Sam Brannen
5752585bb2
Clean up warnings in build
2025-06-07 12:37:27 +02:00
Sam Brannen
3aa3b81e1c
Update copyright headers
2025-06-06 13:49:23 +02:00
Johnny Lim
7f6a7b806e
Replace AssertionsForClassTypes with Assertions
...
Closes gh-34821
Signed-off-by: Johnny Lim <izeye@naver.com >
2025-06-06 13:49:23 +02:00
Sam Brannen
05d59271d2
Merge branch '6.2.x'
2025-06-02 10:48:28 +02:00
Dmytro Nosan
c2d678879f
Fix AOT code generation for autowired inner class constructor
...
Prior to this commit, argument index handling in
AutowiredArgumentsCodeGenerator suffered from an off-by-one error when
generating code for an autowired inner class constructor.
Since the startIndex is already properly calculated for an inner class in
InstanceSupplierCodeGenerator.buildGetInstanceMethodForConstructor(...),
there is no need to adjust the argument indexes within
AutowiredArgumentsCodeGenerator.generateCode(...).
Closes gh-34974
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-06-02 10:43:21 +02:00
Sam Brannen
c5566c947c
Merge branch '6.2.x'
2025-05-30 14:55:22 +02:00
Sam Brannen
016294b067
Avoid overriding methods deprecated in JUnit Jupiter 5.13
...
See gh-34969
2025-05-30 14:54:57 +02:00
Sébastien Deleuze
a638828157
Merge branch '6.2.x'
2025-05-28 10:31:34 +02:00
Sébastien Deleuze
67ed64a41d
Remove not null checks in BeanUtilsKotlinTests
2025-05-28 10:31:07 +02:00
Sébastien Deleuze
d777b70889
Ignore DefaultConstructorMarker in BeanUtils#getParameterNames
...
Closes gh-34760
2025-05-28 10:12:09 +02:00
Juergen Hoeller
b5d153febf
Enforce consistent null check on injection points for pre-existing singleton beans
...
Includes consistent JSpecify nullness check on fields as optional injection points
Closes gh-34952
See gh-34261
2025-05-27 10:25:50 +02:00
Juergen Hoeller
cdfe0895f9
Merge branch '6.2.x'
2025-05-27 09:57:01 +02:00
Juergen Hoeller
d9e261aecd
Enforce backwards compatibility for null bean in shortcut code path
...
Closes gh-34929
2025-05-27 09:47:39 +02:00
Sam Brannen
33aeb6ee9c
Deprecate [Property|Preferences]PlaceholderConfigurer for removal
...
PropertyPlaceholderConfigurer and PreferencesPlaceholderConfigurer have
been officially deprecated since Spring Framework 5.2.
Since we no longer expect applications to depend on these outdated
mechanisms, this commit deprecates these classes "for removal" in
Spring Framework 8.0.
Closes gh-34880
2025-05-11 17:03:42 +02:00
Stéphane Nicoll
e3e99ac8a0
Add a convenience method to create a ValueCodeGenerator
...
This commit makes BeanDefinitionPropertyValueCodeGeneratorDelegates
public and offer a convenience method to create a ValueCodeGenerator
that works will all core delegates.
Closes gh-34761
2025-04-15 17:17:45 +02:00
Juergen Hoeller
7bb7456686
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
# spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
2025-04-10 18:37:07 +02:00
Juergen Hoeller
6ea9f66fd7
Remove superfluous DefaultParameterNameDiscoverer configuration
2025-04-10 18:33:39 +02:00
Juergen Hoeller
18989123ac
Merge branch '6.2.x'
2025-04-03 12:04:38 +02:00
Juergen Hoeller
e7db15b325
Perform type check before singleton check for early FactoryBean matching
...
Closes gh-34710
2025-04-03 11:59:22 +02: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
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
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
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
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
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
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
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
3fff3b8a6d
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
# spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
2025-02-07 19:03:37 +01:00
Juergen Hoeller
ace2f0a3e5
Expose resolveAutowireCandidates method with basic candidate filtering
...
DependencyObjectProvider is aligned to check basic autowire-candidate status even in case of custom filtering.
Closes gh-34203
2025-02-07 19:00:25 +01:00
Stéphane Nicoll
49bd8333e8
Merge branch '6.2.x'
2025-02-05 14:42:42 +01:00
Stéphane Nicoll
ec037b1ec0
Polish "Add support for multidimensional arrays"
...
See gh-34183
2025-02-05 14:35:33 +01:00
xumengqi
68c1e2ac92
Add support for multidimensional arrays
...
See gh-34183
2025-02-05 14:23:09 +01:00
Juergen Hoeller
088d53adb4
Merge branch '6.2.x'
2025-02-03 15:24:59 +01:00
Juergen Hoeller
8c2b44bd6c
Support filtered/unfiltered stream access on ObjectProvider
...
Closes gh-34318
Closes gh-34203
2025-02-03 15:04:27 +01:00
