Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,070 Commits 18 Branches 0 Tags
a97ff390884ba1002f09c7402aed95f1135eefa0
Commit Graph

1833 Commits

Author SHA1 Message Date
Sam Brannen
209e02cf29 Merge branch '6.0.x' 2023-06-24 14:27:13 +02:00
Johnny Lim
3be1216897 Polish 
This commit polishes a bit.

Closes gh-30691
 2023-06-22 15:12:58 +02:00
Sam Brannen
b8a713fde3 Merge branch '6.0.x' 2023-06-22 15:12:25 +02:00
Johnny Lim
271f2dc665 Polish 
This commit polishes a bit.

Closes gh-30691
 2023-06-22 15:06:05 +02:00
Sam Brannen
5598dd2c34 Merge branch '6.0.x' 2023-06-22 13:54:04 +02:00
Sam Brannen
32f061a3e0 Polishing 2023-06-22 13:48:07 +02:00
Sam Brannen
abefc0aba0 Merge branch '6.0.x' 2023-06-21 17:54:16 +02:00
Sam Brannen
9a5290ea27 Apply project conventions to formatting 2023-06-21 17:50:42 +02:00
Sam Brannen
03b304f05c Merge branch '6.0.x' 2023-06-21 17:37:04 +02:00
Sam Brannen
b3176208e2 Remove invalid Javadoc link 2023-06-21 17:36:36 +02:00
Sam Brannen
83447663b4 Merge branch '6.0.x' 2023-06-21 16:21:34 +02:00
Sam Brannen
0eb33d09ac Ensure package-private init/destroy methods are always invoked 
Prior to this commit, if an init/destroy method was package-private and
declared in a superclass in a package different from the package in
which the registered bean resided, a local init/destroy method with the
same name would effectively "shadow" the method from the different
package, resulting in only the local init/destroy method being invoked.

This commit addresses this issue by tracking package-private init
methods from different packages using their fully-qualified method
names, analogous to the existing support for private init/destroy
methods.

Closes gh-30718
 2023-06-21 16:18:19 +02:00
Sam Brannen
f67f98a1a7 Polishing 2023-06-21 15:56:50 +02:00
Stephane Nicoll
b581a79eed Merge branch '6.0.x' 2023-06-21 14:51:00 +02:00
Stephane Nicoll
6c42f374c8 Consistently set target type in generated code 
Previously, a bean definition that is optimized AOT could have
different metadata based on whether its resolved type had a generic or
not. This is due to RootBeanDefinition taking either a Class or a
ResolvableType doing fundamentally different things. While the former
sets the bean class which is to little use with an instance supplier,
the latter specifies the target type of the bean.

This commit sets the target type of the bean, using the existing
setter methods that take either a class or a ResolvableType and set the
same attribute consistently.

Closes gh-30689
 2023-06-21 14:45:19 +02:00
Sam Brannen
6535614d78 Merge branch '6.0.x' 2023-06-21 14:22:11 +02:00
Sam Brannen
4879b56bb9 Test status quo for private init/destroy methods in AOT mode 
This commit only tests which init/destroy methods are "registered" in
AOT mode.

This commit does NOT test that the registered methods can actually be
invoked in AOT mode: that will be addressed in a separate commit.

See gh-30692
 2023-06-21 14:19:13 +02:00
Sam Brannen
2fd83aa764 Polish InitDestroyAnnotationBeanPostProcessor internals, etc. 2023-06-21 14:19:00 +02:00
Juergen Hoeller
1a201cd180 Merge branch '6.0.x' 
# Conflicts:
#	spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java
 2023-06-21 09:51:11 +02:00
Juergen Hoeller
049a024dea Deprecate RootBeanDefinition(ResolvableType) constructor 
Closes gh-30704
 2023-06-21 09:48:00 +02:00
Sam Brannen
3344ab909b Merge branch '6.0.x' 2023-06-20 15:49:13 +02:00
Sam Brannen
564f33d5ef Polishing 2023-06-20 15:47:41 +02:00
Sam Brannen
7681d12eb0 Merge branch '6.0.x' 
# Conflicts:
#	gradle.properties
 2023-06-15 16:15:17 +02:00
Sam Brannen
5672284f53 Remove code duplication in RootBeanDefinition 2023-06-15 16:11:40 +02:00
Juergen Hoeller
96ae03b48f Merge branch '6.0.x' 2023-06-14 22:27:55 +02:00
Juergen Hoeller
c30f6aa427 Polishing 2023-06-14 22:17:39 +02:00
Juergen Hoeller
c276e5b679 Consistent use of 6.1 as generational version number 2023-06-14 21:58:45 +02:00
Juergen Hoeller
3de4e931c7 Javadoc notes on isSimpleValueType in BeanUtils vs ClassUtils 
See gh-30664
 2023-06-14 10:40:14 +02:00
Juergen Hoeller
ca4de8f191 Consistent simple value type check 
Includes UUID treatment for data binding and bean dependency checks.

Closes gh-30664
 2023-06-14 09:37:39 +02:00
Sam Brannen
e7c3e1c516 Merge branch '6.0.x' 2023-06-13 17:14:03 +02:00
Sam Brannen
ed74b04520 Move web-related test for BeanUtilsRuntimeHints to spring-web 
The dependency on spring-web from spring-beans makes it impossible to
import the projects in Eclipse IDE due to cycles between projects.

This commit therefore moves the web-related test for
BeanUtilsRuntimeHints to spring-web.

See gh-30491
 2023-06-13 17:12:38 +02:00
Sébastien Deleuze
ccb8db41f0 Merge branch '6.0.x' 2023-06-09 15:21:54 +02:00
Sébastien Deleuze
439bcd6715 Polishing 2023-06-09 15:19:42 +02:00
Sébastien Deleuze
4e33d0c293 Add missing hint for ResourceEditor 
Closes gh-30628
 2023-06-09 15:19:18 +02:00
Sébastien Deleuze
46fe7f5bea Merge branch '6.0.x' 2023-06-09 14:17:45 +02:00
Sébastien Deleuze
071d6a2a5a Introduce hints for finding hints by conventions 
Closes gh-30491
 2023-06-09 14:14:54 +02:00
Johnny Lim
7a4ed38cd4 This PR adds Javadoc for RegisteredBean.resolveAutowiredArgument() 
See gh-30401
Closes gh-30609
 2023-06-08 16:06:14 +02:00
Johnny Lim
a726b5109a This PR adds Javadoc for RegisteredBean.resolveAutowiredArgument() 
See gh-30401
Closes gh-30609
 2023-06-07 16:00:30 +02:00
Sam Brannen
75466fee8d Merge branch '6.0.x' 2023-06-04 16:40:23 +02:00
Sam Brannen
4f10f559f7 Suppress warnings 2023-06-04 16:36:20 +02:00
Juergen Hoeller
e82dd14f0f Merge branch '6.0.x' 
# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
 2023-06-02 23:30:04 +02:00
Juergen Hoeller
4b8adf2dcc Polishing 2023-06-02 23:28:14 +02:00
Juergen Hoeller
8c6287ef7b Expose parameter/field name for non-JavaBeans type conversion 
Supports name-bound PropertyEditor registrations on data classes.
Includes consistent support for field-aware method parameters.

Closes gh-28284
 2023-06-02 20:42:05 +02:00
Juergen Hoeller
322cbca0dc Support for async/reactive close methods (e.g. R2DBC) 
Closes gh-26991
 2023-06-02 20:40:55 +02:00
Juergen Hoeller
7150c23e93 Merge branch '6.0.x' 2023-05-26 11:03:48 +02:00
Juergen Hoeller
8b8d147480 Avoid Autowired shortcut resolution for NullBean values 
Includes getBean documentation against NullBean values.

Closes gh-30485
 2023-05-26 11:03:10 +02:00
Sam Brannen
b5902f4fbf Suppress unused warnings in tests 2023-05-23 15:09:10 +02:00
Stephane Nicoll
5e07141846 Merge branch '6.0.x' 2023-05-22 15:30:47 +02:00
Johnny Lim
15a7f43c7b Add Javadoc since to InjectedElement.shouldInject() 
See gh-30512
 2023-05-22 15:30:05 +02:00
Brian Clozel
40543e0a58 Polish SnakeYAML 2.0 upgrade 
See gh-30048
 2023-05-22 14:52:59 +02:00