e239753a1b
Merge branch '6.0.x'
2023-08-27 18:03:59 +02:00
1396daa4b6
Polish "Make sure NoUniqueBeanDefinitionException to be serializable"
...
See gh-29753
2023-08-27 17:59:27 +02:00
1b409d5290
Make sure NoUniqueBeanDefinitionException to be serializable
...
See gh-29753
2023-08-27 17:56:58 +02:00
8efc7a958e
Polish "Improve @Autowired method injection on mixed nullability args"
...
See gh-17215
2023-08-25 12:47:05 +02:00
32c0540424
Improve @Autowired method injection on mixed nullability args
...
See gh-17215
2023-08-25 12:44:16 +02:00
5878a0741e
Polish "Add factory to create a NamedThreadLocal with an initial value"
...
See gh-24705
2023-08-23 18:58:12 +02:00
2b76c4d847
Polish "Wrap ternary operator within parentheses"
...
See gh-31076
2023-08-22 15:40:16 +02:00
45c20e34e4
Merge branch '6.0.x'
...
# Conflicts:
# spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
2023-08-14 19:29:14 +02:00
8b3ddeed05
Test factory-bean/method placeholders as well
...
See gh-20189
2023-08-14 19:28:12 +02:00
6baa60d454
Polishing
2023-08-12 14:51:02 +02:00
9ede1d07a0
Revise multiple beans resolution for custom collection types
...
Closes gh-30022
2023-08-12 12:48:14 +02:00
0c477f14cc
Polishing
...
See gh-28638
2023-08-09 11:14:42 +02:00
c38f053905
Add Kotlin value classes tests with primitive types
...
This commit adds more Kotlin value classes tests with
primitive types to ensure testing unwrapped use case.
See gh-28638
2023-08-09 11:12:56 +02:00
88c2a25f12
Add support for Kotlin value classes in BeanUtils
...
This commit adds support for Kotlin value classes annotated
with @JvmInline to BeanUtils#findPrimaryConstructor.
This is only the first step, more refinements are expected
to be needed to achieve a comprehensive support of Kotlin
values classes in Spring Framework.
Closes gh-28638
2023-08-09 10:31:49 +02:00
3c34e69cc2
Merge branch '6.0.x'
2023-08-07 14:53:01 +02:00
156b3696a7
Reinstate Introspector.flushFromCaches() call for JDK ClassInfo cache
...
Closes gh-27781
2023-08-07 14:51:49 +02:00
526fc391ee
Use Class#componentType() for consistency with arrayType()
...
Java 12 introduced java.lang.Class#componentType() as a shortcut for
getComponentType().
Since we started using arrayType() in fe5560400c
2023-08-07 12:43:40 +03:00
fe5560400c
Use Class#arrayType() where feasible
...
Closes gh-31002
2023-08-07 12:07:46 +03:00
eaf54b54c3
Detect illegal bean definition override during classpath scanning
...
Closes gh-25952
2023-08-06 14:03:29 +02:00
3758e5155c
Merge branch '6.0.x'
2023-08-04 15:35:16 +03:00
07a1aea9c7
Skip array sort when the length of array not greater than 1
...
Closes gh-30934
2023-08-04 15:25:46 +03:00
4e863c5a75
Merge branch '6.0.x'
2023-08-04 02:40:17 +02:00
18966d048c
Consistent equals/hashCode style (and related polishing)
2023-08-04 02:39:31 +02:00
a6ff95a69c
Restore restrictive getTypeForFactoryBeanFromAttributes check
...
See gh-29799
See gh-30987
2023-08-04 00:56:01 +02:00
f7c3e6480a
Merge branch '6.0.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
2023-08-04 00:49:20 +02:00
7e6612a920
Sort multiple @Autowired methods on same bean class via ASM
...
Closes gh-30359
2023-08-04 00:47:18 +02:00
9333ed22f6
Avoid repeated FactoryBean targetType check
...
See gh-30987
2023-08-04 00:47:04 +02:00
d868f58e6e
Merge branch '6.0.x'
...
# Conflicts:
# spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java
2023-08-03 18:11:08 +02:00
4b6fabbd2f
Polishing
2023-08-03 18:10:13 +02:00
cba2b6eaf4
Check FactoryBean targetType for generic type as well
...
Closes gh-30987
2023-08-03 18:10:07 +02:00
84b3335e71
Apply array editor to collection of same element type as well
...
Closes gh-24845
2023-08-03 17:55:54 +02:00
c3e18bc173
Retain metadata during bean creation even with cacheBeanMetadata=false
...
Closes gh-23795
Closes gh-25749
2023-08-03 17:55:47 +02:00
2e07a72119
Delete duplicate DummyFactory
2023-08-02 11:09:15 +03:00
d250a5155a
Consistent dependency declarations
2023-08-02 00:56:50 +02:00
4b7d1e3a2c
Delete duplicate DummyFactory
2023-08-02 11:29:15 +03:00
44d14811d3
Suppress deprecation warnings in test fixtures
2023-08-02 10:51:03 +03:00
89b85c81a7
Polishing
2023-08-02 10:21:06 +03:00
3b1af692cc
Merge branch '6.0.x'
...
# Conflicts:
# spring-beans/spring-beans.gradle
# spring-context/spring-context.gradle
# spring-orm/spring-orm.gradle
# spring-test/spring-test.gradle
# spring-web/spring-web.gradle
# spring-webflux/spring-webflux.gradle
2023-08-02 01:04:31 +02:00
2d50b758c4
Deprecate applyBeanPostProcessorsBefore/AfterInitialization
...
Closes gh-30974
2023-08-01 23:28:06 +02:00
12f765c133
Assert XmlBeanDefinitionReader.setValidationMode() values
...
See gh-30851
2023-07-31 16:08:47 +03:00
bbde68c49e
Polishing
2023-07-25 19:12:07 +02:00
5ebbb3ff3e
Merge branch '6.0.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
# spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
# spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
2023-07-25 19:13:33 +02:00
fdf1418dfb
Polishing
2023-07-24 11:21:13 +02:00
4786e2bf53
Introduce PREFERRED_CONSTRUCTORS_ATTRIBUTE on AbstractBeanDefinition
...
Closes gh-30917
2023-07-22 16:06:14 +02:00
25ea1f4c0f
Merge branch '6.0.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
2023-07-19 00:37:06 +02:00
2f33e77ab4
Consistent equals/hashCode style (and related polishing)
2023-07-19 00:35:19 +02:00
c504ac5a47
Merge branch '6.0.x'
2023-07-18 12:57:18 +02:00
1ac0549881
Polishing
2023-07-18 12:55:32 +02:00
161a717639
Avoid synchronization for shortcut re-resolution
...
See gh-30883
2023-07-16 16:22:17 +02:00
30d6ec3398
Update copyright headers
2023-07-15 16:01:15 +02:00
Stephane Nicoll
Per Lundberg
陈其苗
Juergen Hoeller
Sébastien Deleuze
Sam Brannen
xumengqi