Browse Source

Polishing

pull/36449/head
Juergen Hoeller 7 days ago
parent
commit
63ced3f3b4
  1. 1
      spring-core/src/main/java/org/springframework/core/type/classreading/MergedAnnotationReadingVisitor.java
  2. 2
      spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
  3. 2
      spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java
  4. 8
      spring-core/src/test/java/org/springframework/core/codec/ResourceRegionEncoderTests.java

1
spring-core/src/main/java/org/springframework/core/type/classreading/MergedAnnotationReadingVisitor.java

@ -117,6 +117,7 @@ class MergedAnnotationReadingVisitor<A extends Annotation> extends AnnotationVis @@ -117,6 +117,7 @@ class MergedAnnotationReadingVisitor<A extends Annotation> extends AnnotationVis
return new MergedAnnotationReadingVisitor<>(this.classLoader, this.source, type, consumer);
}
@SuppressWarnings("unchecked")
static <A extends Annotation> @Nullable AnnotationVisitor get(@Nullable ClassLoader classLoader,
@Nullable Object source, String descriptor, boolean visible,

2
spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java

@ -32,7 +32,6 @@ import org.springframework.core.io.ResourceLoader; @@ -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 { @@ -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());

2
spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java

@ -30,7 +30,7 @@ import org.springframework.core.io.ResourceLoader; @@ -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.

8
spring-core/src/test/java/org/springframework/core/codec/ResourceRegionEncoderTests.java

@ -41,11 +41,13 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -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 { @@ -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<ResourceRegion> regions = Flux.just(
@ -138,7 +140,7 @@ class ResourceRegionEncoderTests extends AbstractLeakCheckingTests { @@ -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<ResourceRegion> regions = Mono.just(new ResourceRegion(resource, 0, 6));

Loading…
Cancel
Save