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 f25bdc19565..0af13e6d002 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 @@ -117,6 +117,7 @@ class MergedAnnotationReadingVisitor extends AnnotationVis return new MergedAnnotationReadingVisitor<>(this.classLoader, this.source, type, consumer); } + @SuppressWarnings("unchecked") static @Nullable AnnotationVisitor get(@Nullable ClassLoader classLoader, @Nullable Object source, String descriptor, boolean visible, diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java index 3d0d6e0de32..2d55b67e817 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java @@ -32,7 +32,6 @@ import org.springframework.core.io.ResourceLoader; */ public class SimpleMetadataReaderFactory extends AbstractMetadataReaderFactory { - /** * Create a new SimpleMetadataReaderFactory for the default class loader. */ @@ -57,6 +56,7 @@ public class SimpleMetadataReaderFactory extends AbstractMetadataReaderFactory { super(classLoader); } + @Override public MetadataReader getMetadataReader(Resource resource) throws IOException { return new SimpleMetadataReader(resource, getResourceLoader().getClassLoader()); diff --git a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java index 0aab392609c..1ad976ea49b 100644 --- a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java +++ b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java @@ -30,7 +30,7 @@ import org.springframework.core.io.ResourceLoader; * @author Brian Clozel * @since 7.0 */ -class ClassFileMetadataReaderFactory extends AbstractMetadataReaderFactory { +final class ClassFileMetadataReaderFactory extends AbstractMetadataReaderFactory { /** * Create a new ClassFileMetadataReaderFactory for the default class loader. diff --git a/spring-core/src/test/java/org/springframework/core/codec/ResourceRegionEncoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/ResourceRegionEncoderTests.java index 3d813822d69..bb67f3025a9 100644 --- a/spring-core/src/test/java/org/springframework/core/codec/ResourceRegionEncoderTests.java +++ b/spring-core/src/test/java/org/springframework/core/codec/ResourceRegionEncoderTests.java @@ -41,11 +41,13 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Test cases for {@link ResourceRegionEncoder} class. + * * @author Brian Clozel */ class ResourceRegionEncoderTests extends AbstractLeakCheckingTests { - private ResourceRegionEncoder encoder = new ResourceRegionEncoder(); + private final ResourceRegionEncoder encoder = new ResourceRegionEncoder(); + @Test void canEncode() { @@ -116,7 +118,7 @@ class ResourceRegionEncoderTests extends AbstractLeakCheckingTests { .verify(); } - @Test // gh-22107 + @Test // gh-22107 void cancelWithoutDemandForMultipleResourceRegions() { Resource resource = new ClassPathResource("ResourceRegionEncoderTests.txt", getClass()); Flux regions = Flux.just( @@ -138,7 +140,7 @@ class ResourceRegionEncoderTests extends AbstractLeakCheckingTests { subscriber.cancel(); } - @Test // gh-22107 + @Test // gh-22107 void cancelWithoutDemandForSingleResourceRegion() { Resource resource = new ClassPathResource("ResourceRegionEncoderTests.txt", getClass()); Mono regions = Mono.just(new ResourceRegion(resource, 0, 6));