Skip to content

Commit 6bdf7ad

Browse files
committed
Polishing
1 parent d2108d2 commit 6bdf7ad

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public int hashCode() {
123123
public String toString() {
124124
return getClass().getName() + ": " + Arrays.toString(this.filters);
125125
}
126-
127126
}
128127

129128

@@ -164,7 +163,6 @@ public int hashCode() {
164163
public String toString() {
165164
return getClass().getName() + ": " + Arrays.toString(this.filters);
166165
}
167-
168166
}
169167

170168
}

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGenerator.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class BeanDefinitionPropertyValueCodeGenerator {
6969

7070
BeanDefinitionPropertyValueCodeGenerator(GeneratedMethods generatedMethods,
7171
@Nullable BiFunction<Object, ResolvableType, CodeBlock> customValueGenerator) {
72+
7273
this.generatedMethods = generatedMethods;
7374
this.delegates = new ArrayList<>();
7475
if (customValueGenerator != null) {
@@ -143,7 +144,6 @@ private interface Delegate {
143144

144145
@Nullable
145146
CodeBlock generateCode(Object value, ResolvableType type);
146-
147147
}
148148

149149

@@ -163,7 +163,6 @@ private static class PrimitiveDelegate implements Delegate {
163163
'\\', "\\\\"
164164
);
165165

166-
167166
@Override
168167
@Nullable
169168
public CodeBlock generateCode(Object value, ResolvableType type) {
@@ -231,7 +230,6 @@ public CodeBlock generateCode(Object value, ResolvableType type) {
231230
}
232231
return null;
233232
}
234-
235233
}
236234

237235

@@ -321,8 +319,8 @@ public CollectionDelegate(Class<?> collectionType, CodeBlock emptyResult) {
321319
this.emptyResult = emptyResult;
322320
}
323321

324-
@Override
325322
@SuppressWarnings("unchecked")
323+
@Override
326324
@Nullable
327325
public CodeBlock generateCode(Object value, ResolvableType type) {
328326
if (this.collectionType.isInstance(value)) {

spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ else if (javaxResourceType != null && bridgedMethod.isAnnotationPresent(javaxRes
445445
* @see #getResource
446446
* @see Lazy
447447
*/
448-
protected Object buildLazyResourceProxy(final LookupElement element, final @Nullable String requestingBeanName) {
448+
protected Object buildLazyResourceProxy(LookupElement element, @Nullable String requestingBeanName) {
449449
TargetSource ts = new TargetSource() {
450450
@Override
451451
public Class<?> getTargetClass() {
@@ -525,16 +525,16 @@ protected Object autowireResource(BeanFactory factory, LookupElement element, @N
525525
String name = element.name;
526526

527527
if (factory instanceof AutowireCapableBeanFactory autowireCapableBeanFactory) {
528-
DependencyDescriptor descriptor = element.getDependencyDescriptor();
529528
if (this.fallbackToDefaultTypeMatch && element.isDefaultName && !factory.containsBean(name)) {
530529
autowiredBeanNames = new LinkedHashSet<>();
531-
resource = autowireCapableBeanFactory.resolveDependency(descriptor, requestingBeanName, autowiredBeanNames, null);
530+
resource = autowireCapableBeanFactory.resolveDependency(
531+
element.getDependencyDescriptor(), requestingBeanName, autowiredBeanNames, null);
532532
if (resource == null) {
533533
throw new NoSuchBeanDefinitionException(element.getLookupType(), "No resolvable resource object");
534534
}
535535
}
536536
else {
537-
resource = autowireCapableBeanFactory.resolveBeanByName(name, descriptor);
537+
resource = autowireCapableBeanFactory.resolveBeanByName(name, element.getDependencyDescriptor());
538538
autowiredBeanNames = Collections.singleton(name);
539539
}
540540
}
@@ -661,8 +661,6 @@ protected Object getResourceToInject(Object target, @Nullable String requestingB
661661
}
662662

663663

664-
665-
666664
/**
667665
* Class representing injection information about an annotated field
668666
* or setter method, supporting the @Resource annotation.

spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,6 @@ private static <T> T instantiate(KFunction<T> kotlinConstructor, Map<KParameter,
498498

499499
/**
500500
* Strategy for resolving constructor arguments based on their type.
501-
*
502501
* @since 6.0
503502
* @see ArgumentResolver#of(Class, Object)
504503
* @see ArgumentResolver#ofSupplied(Class, Supplier)
@@ -595,21 +594,18 @@ static <T> ArgumentResolver ofSupplied(Class<T> type, Supplier<T> valueSupplier)
595594
*/
596595
static ArgumentResolver from(Function<Class<?>, Object> function) {
597596
return new ArgumentResolver() {
598-
599597
@SuppressWarnings("unchecked")
600598
@Override
601599
public <T> T resolve(Class<T> type) {
602600
return (T) function.apply(type);
603601
}
604-
605602
};
606603
}
607604
}
608605

609606

610607
/**
611608
* Strategy for handling a failure that occurs when instantiating a factory.
612-
*
613609
* @since 6.0
614610
* @see FailureHandler#throwing()
615611
* @see FailureHandler#logging(Log)
@@ -671,7 +667,7 @@ static FailureHandler logging(Log logger) {
671667
static FailureHandler handleMessage(BiConsumer<Supplier<String>, Throwable> messageHandler) {
672668
return (factoryType, factoryImplementationName, failure) -> {
673669
Supplier<String> messageSupplier = () -> "Unable to instantiate factory class [%s] for factory type [%s]"
674-
.formatted(factoryImplementationName, factoryType.getName());
670+
.formatted(factoryImplementationName, factoryType.getName());
675671
messageHandler.accept(messageSupplier, failure);
676672
};
677673
}

0 commit comments

Comments
 (0)