Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
This commit is contained in:
Juergen Hoeller
2024-02-26 13:42:00 +01:00
parent 5c589833d7 479879c53a
commit 4d206f79d0
5 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -1325,6 +1325,11 @@ class DefaultListableBeanFactoryTests {
rbd.getPropertyValues().add("value", Duration.ofSeconds(1000));
lbf.registerBeanDefinition("overloaded", rbd);
assertThat(lbf.getBean(SetterOverload.class).getObject()).isEqualTo("1000s");
rbd = new RootBeanDefinition(SetterOverload.class);
rbd.getPropertyValues().add("value", "1000");
lbf.registerBeanDefinition("overloaded", rbd);
assertThat(lbf.getBean(SetterOverload.class).getObject()).isEqualTo("1000i");
}
@Test
@@ -3382,13 +3387,13 @@ class DefaultListableBeanFactoryTests {
return this.value;
}
public void setValue(int length) {
this.value = length + "i";
}
public void setValue(Duration duration) {
this.value = duration.getSeconds() + "s";
}
public void setValue(int length) {
this.value = length + "i";
}
}

10
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
View File

@@ -2547,23 +2547,21 @@ class AutowiredAnnotationBeanPostProcessorTests {
assertThat(mixedOptionalInjectionBean.nullableBean).isNull();
}
private <E extends UnsatisfiedDependencyException> Consumer<E> methodParameterDeclaredOn(
Class<?> expected) {
private <E extends UnsatisfiedDependencyException> Consumer<E> methodParameterDeclaredOn(Class<?> expected) {
return declaredOn(
injectionPoint -> injectionPoint.getMethodParameter().getDeclaringClass(),
expected);
}
private <E extends UnsatisfiedDependencyException> Consumer<E> fieldDeclaredOn(
Class<?> expected) {
private <E extends UnsatisfiedDependencyException> Consumer<E> fieldDeclaredOn(Class<?> expected) {
return declaredOn(
injectionPoint -> injectionPoint.getField().getDeclaringClass(),
expected);
}
private <E extends UnsatisfiedDependencyException> Consumer<E> declaredOn(
Function<InjectionPoint, Class<?>> declaringClassExtractor,
Class<?> expected) {
Function<InjectionPoint, Class<?>> declaringClassExtractor, Class<?> expected) {
return ex -> {
InjectionPoint injectionPoint = ex.getInjectionPoint();
Class<?> declaringClass = declaringClassExtractor.apply(injectionPoint);