From ddbb7c1b5b003018ee4ebd483ca4a22dd60a53c7 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 23 Jun 2021 14:50:33 +0200 Subject: [PATCH] Avoid use of Supplier in MergedAnnotationReadingVisitor.get --- .../type/classreading/MergedAnnotationReadingVisitor.java | 6 ++---- .../SimpleAnnotationMetadataReadingVisitor.java | 2 +- .../classreading/SimpleMethodMetadataReadingVisitor.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/MergedAnnotationReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MergedAnnotationReadingVisitor.java index 4a86118843d..d17132e9ffd 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/MergedAnnotationReadingVisitor.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/MergedAnnotationReadingVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2021 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. @@ -23,7 +23,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.function.Consumer; -import java.util.function.Supplier; import org.springframework.asm.AnnotationVisitor; import org.springframework.asm.SpringAsmInfo; @@ -121,7 +120,7 @@ class MergedAnnotationReadingVisitor extends AnnotationVis @SuppressWarnings("unchecked") @Nullable static AnnotationVisitor get(@Nullable ClassLoader classLoader, - @Nullable Supplier sourceSupplier, String descriptor, boolean visible, + @Nullable Object source, String descriptor, boolean visible, Consumer> consumer) { if (!visible) { @@ -133,7 +132,6 @@ class MergedAnnotationReadingVisitor extends AnnotationVis return null; } - Object source = (sourceSupplier != null ? sourceSupplier.get() : null); try { Class annotationType = (Class) ClassUtils.forName(typeName, classLoader); return new MergedAnnotationReadingVisitor<>(classLoader, source, annotationType, consumer); diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java index eb11235c920..6422cda9910 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java @@ -117,7 +117,7 @@ final class SimpleAnnotationMetadataReadingVisitor extends ClassVisitor { @Override @Nullable public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) { - return MergedAnnotationReadingVisitor.get(this.classLoader, this::getSource, + return MergedAnnotationReadingVisitor.get(this.classLoader, getSource(), descriptor, visible, this.annotations::add); } diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java index 9bc09afcd7a..df18e489b81 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java @@ -72,7 +72,7 @@ final class SimpleMethodMetadataReadingVisitor extends MethodVisitor { @Override @Nullable public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) { - return MergedAnnotationReadingVisitor.get(this.classLoader, this::getSource, + return MergedAnnotationReadingVisitor.get(this.classLoader, getSource(), descriptor, visible, this.annotations::add); }