root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2024-02-26 13:40:21 +01:00
parent 2e57603310
commit 479879c53a
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -1122,7 +1122,8 @@ public class ResolvableType implements Serializable {
Assert.notNull(clazz, "Class must not be null"); Assert.notNull(clazz, "Class must not be null");
Assert.notNull(generics, "Generics array must not be null"); Assert.notNull(generics, "Generics array must not be null");
TypeVariable<?>[] variables = clazz.getTypeParameters(); 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]; Type[] arguments = new Type[generics.length];
for (int i = 0; i < generics.length; i++) { for (int i = 0; i < generics.length; i++) {

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

@ -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. * than one idle instance among its scheduled invokers.
*/ */
private int getIdleInvokerCount() { private int getIdleInvokerCount() {