Browse Source

Polishing

pull/32403/head
Juergen Hoeller 2 years ago
parent
commit
479879c53a
  1. 10
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
  2. 5
      spring-core/src/main/java/org/springframework/core/ResolvableType.java
  3. 2
      spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java

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

@ -2542,23 +2542,21 @@ class AutowiredAnnotationBeanPostProcessorTests { @@ -2542,23 +2542,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);

5
spring-core/src/main/java/org/springframework/core/ResolvableType.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -1122,7 +1122,8 @@ public class ResolvableType implements Serializable { @@ -1122,7 +1122,8 @@ public class ResolvableType implements Serializable {
Assert.notNull(clazz, "Class must not be null");
Assert.notNull(generics, "Generics array must not be null");
TypeVariable<?>[] variables = clazz.getTypeParameters();
Assert.isTrue(variables.length == generics.length, () -> "Mismatched number of generics specified for " + clazz.toGenericString());
Assert.isTrue(variables.length == generics.length,
() -> "Mismatched number of generics specified for " + clazz.toGenericString());
Type[] arguments = new Type[generics.length];
for (int i = 0; i < generics.length; i++) {

2
spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java

@ -856,7 +856,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe @@ -856,7 +856,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
}
/**
* Determine whether this listener container currently has more
* Called to determine whether this listener container currently has more
* than one idle instance among its scheduled invokers.
*/
private int getIdleInvokerCount() {

Loading…
Cancel
Save