Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,552 Commits 18 Branches 0 Tags
96fd3c10fb1ed0891f19fe64bb2ad8310f24cd4a
Commit Graph

1832 Commits

Author SHA1 Message Date
Sam Brannen
fe5560400c Use Class#arrayType() where feasible 
Closes gh-31002
 2023-08-07 12:07:46 +03:00
Juergen Hoeller
eaf54b54c3 Detect illegal bean definition override during classpath scanning 
Closes gh-25952
 2023-08-06 14:03:29 +02:00
Sam Brannen
3758e5155c Merge branch '6.0.x' 2023-08-04 15:35:16 +03:00
xumengqi
07a1aea9c7 Skip array sort when the length of array not greater than 1 
Closes gh-30934
 2023-08-04 15:25:46 +03:00
Juergen Hoeller
4e863c5a75 Merge branch '6.0.x' 2023-08-04 02:40:17 +02:00
Juergen Hoeller
18966d048c Consistent equals/hashCode style (and related polishing) 2023-08-04 02:39:31 +02:00
Juergen Hoeller
a6ff95a69c Restore restrictive getTypeForFactoryBeanFromAttributes check 
See gh-29799
See gh-30987
 2023-08-04 00:56:01 +02:00
Juergen Hoeller
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
Juergen Hoeller
7e6612a920 Sort multiple @Autowired methods on same bean class via ASM 
Closes gh-30359
 2023-08-04 00:47:18 +02:00
Juergen Hoeller
9333ed22f6 Avoid repeated FactoryBean targetType check 
See gh-30987
 2023-08-04 00:47:04 +02:00
Juergen Hoeller
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
Juergen Hoeller
4b6fabbd2f Polishing 2023-08-03 18:10:13 +02:00
Juergen Hoeller
cba2b6eaf4 Check FactoryBean targetType for generic type as well 
Closes gh-30987
 2023-08-03 18:10:07 +02:00
Juergen Hoeller
84b3335e71 Apply array editor to collection of same element type as well 
Closes gh-24845
 2023-08-03 17:55:54 +02:00
Juergen Hoeller
c3e18bc173 Retain metadata during bean creation even with cacheBeanMetadata=false 
Closes gh-23795
Closes gh-25749
 2023-08-03 17:55:47 +02:00
Sam Brannen
2e07a72119 Delete duplicate DummyFactory 2023-08-02 11:09:15 +03:00
Juergen Hoeller
d250a5155a Consistent dependency declarations 2023-08-02 00:56:50 +02:00
Sam Brannen
4b7d1e3a2c Delete duplicate DummyFactory 2023-08-02 11:29:15 +03:00
Sam Brannen
44d14811d3 Suppress deprecation warnings in test fixtures 2023-08-02 10:51:03 +03:00
Sam Brannen
89b85c81a7 Polishing 2023-08-02 10:21:06 +03:00
Juergen Hoeller
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
Juergen Hoeller
2d50b758c4 Deprecate applyBeanPostProcessorsBefore/AfterInitialization 
Closes gh-30974
 2023-08-01 23:28:06 +02:00
Sam Brannen
12f765c133 Assert XmlBeanDefinitionReader.setValidationMode() values 
See gh-30851
 2023-07-31 16:08:47 +03:00
Juergen Hoeller
bbde68c49e Polishing 2023-07-25 19:12:07 +02:00
Juergen Hoeller
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
Juergen Hoeller
fdf1418dfb Polishing 2023-07-24 11:21:13 +02:00
Juergen Hoeller
4786e2bf53 Introduce PREFERRED_CONSTRUCTORS_ATTRIBUTE on AbstractBeanDefinition 
Closes gh-30917
 2023-07-22 16:06:14 +02:00
Juergen Hoeller
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
Juergen Hoeller
2f33e77ab4 Consistent equals/hashCode style (and related polishing) 2023-07-19 00:35:19 +02:00
Juergen Hoeller
c504ac5a47 Merge branch '6.0.x' 2023-07-18 12:57:18 +02:00
Juergen Hoeller
1ac0549881 Polishing 2023-07-18 12:55:32 +02:00
Juergen Hoeller
161a717639 Avoid synchronization for shortcut re-resolution 
See gh-30883
 2023-07-16 16:22:17 +02:00
Sam Brannen
30d6ec3398 Update copyright headers 2023-07-15 16:01:15 +02:00
Juergen Hoeller
6183f06846 Cache DependencyDescriptor per autowired constructor argument 
Aligned with shortcut handling in AutowiredAnnotationBeanPostProcessor.
Includes minor MethodInvoker optimization for pre-resolved targetClass.

Closes gh-30883
 2023-07-15 14:17:52 +02:00
Sam Brannen
a34f9fa66c Update copyright headers 2023-07-15 13:10:46 +02:00
Juergen Hoeller
0e9cd2a35f Merge branch '6.0.x' 2023-07-16 16:23:15 +02:00
Sam Brannen
6f733512b5 Stop using Constants utility in XmlBeanDefinitionReader 
See gh-30851
 2023-07-16 13:29:44 +02:00
Sam Brannen
d6e05ddf2d Polish XmlBeanDefinitionReaderTests 2023-07-16 13:22:48 +02:00
Sam Brannen
a92bd42236 Stop using Constants utility in PropertyPlaceholderConfigurer 
See gh-30851
 2023-07-16 12:56:03 +02:00
Sam Brannen
cebda46469 Polish PropertyPlaceholderConfigurerTests 2023-07-16 12:56:03 +02:00
Sam Brannen
bcd09d7ad8 Merge branch '6.0.x' 2023-07-15 16:01:47 +02:00
Juergen Hoeller
351a200747 Merge branch '6.0.x' 2023-07-15 14:21:05 +02:00
Sam Brannen
5ce8ffd197 Merge branch '6.0.x' 2023-07-15 13:11:03 +02:00
Stephane Nicoll
4dc93bc485 Avoid ambiguous call with BeanInstanceSupplier#withGenerator 
Previously, BeanInstanceSupplier had three variants of the
`withGenerator` callback, one with a bi function, one with a function,
and with a supplier. This could lead to compilation failure when the
target type has a method with the same name and a number of arguments
that match another variant.

It turns out the supplier-based variant is only used a shortcut. This
commit deprecates it and update ghe code generation to use the function
instead.

Closes gh-29278
 2023-07-12 17:23:08 +02:00
Stephane Nicoll
f73f1e0687 Merge branch '6.0.x' 2023-07-12 17:22:44 +02:00
Stephane Nicoll
1b09ef5051 Avoid ambiguous call with BeanInstanceSupplier#withGenerator 
Previously, BeanInstanceSupplier had three variants of the
`withGenerator` callback, one with a bi function, one with a function,
and with a supplier. This could lead to compilation failure when the
target type has a method with the same name and a number of arguments
that match another variant.

It turns out the supplier-based variant is only used a shortcut. This
commit deprecates it and update ghe code generation to use the function
instead.

Closes gh-29278
 2023-07-12 16:40:22 +02:00
Juergen Hoeller
c1932dd307 Support for MultiValueMap elements in bean property paths 
Closes gh-26297
 2023-07-12 16:23:39 +02:00
Sam Brannen
16b9640af2 Merge branch '6.0.x' 2023-07-12 11:50:11 +02:00
Sam Brannen
68f2b0ca59 Rely on auto-boxing in tests 2023-07-12 11:49:02 +02:00
Juergen Hoeller
c20a2e4763 Support for indexing into any Collection/Iterable 
Closes gh-907
 2023-07-11 23:07:51 +02:00