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

Avoid expensive isReadable() check during classpath scan 

Closes gh-25741
See gh-21372
This commit is contained in:
Juergen Hoeller 2021-10-12 15:15:51 +02:00
parent b53275f2d2
commit 715f300fa1
4 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 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.
@ -16,6 +16,7 @@
package org.springframework.context.annotation; package org.springframework.context.annotation;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.util.ArrayList; import java.util.ArrayList;
@ -424,40 +425,38 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
if (traceEnabled) { if (traceEnabled) {
logger.trace("Scanning " + resource); logger.trace("Scanning " + resource);
} }
if (resource.isReadable()) { try {
try { MetadataReader metadataReader = getMetadataReaderFactory().getMetadataReader(resource);
MetadataReader metadataReader = getMetadataReaderFactory().getMetadataReader(resource); if (isCandidateComponent(metadataReader)) {
if (isCandidateComponent(metadataReader)) { ScannedGenericBeanDefinition sbd = new ScannedGenericBeanDefinition(metadataReader);
ScannedGenericBeanDefinition sbd = new ScannedGenericBeanDefinition(metadataReader); sbd.setSource(resource);
sbd.setSource(resource); if (isCandidateComponent(sbd)) {
if (isCandidateComponent(sbd)) { if (debugEnabled) {
if (debugEnabled) { logger.debug("Identified candidate component class: " + resource);
logger.debug("Identified candidate component class: " + resource);
}
candidates.add(sbd);
}
else {
if (debugEnabled) {
logger.debug("Ignored because not a concrete top-level class: " + resource);
}
} }
candidates.add(sbd);
} }
else { else {
if (traceEnabled) { if (debugEnabled) {
logger.trace("Ignored because not matching any filter: " + resource); logger.debug("Ignored because not a concrete top-level class: " + resource);
} }
} }
} }
catch (Throwable ex) { else {
throw new BeanDefinitionStoreException( if (traceEnabled) {
"Failed to read candidate component class: " + resource, ex); logger.trace("Ignored because not matching any filter: " + resource);
}
} }
} }
else { catch (FileNotFoundException ex) {
if (traceEnabled) { if (traceEnabled) {
logger.trace("Ignored because not readable: " + resource); logger.trace("Ignored non-readable " + resource + ": " + ex.getMessage());
} }
} }
catch (Throwable ex) {
throw new BeanDefinitionStoreException(
"Failed to read candidate component class: " + resource, ex);
}
} }
} }
catch (IOException ex) { catch (IOException ex) {

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2021 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.
@ -48,8 +48,9 @@ public interface InputStreamSource {
* creating mail attachments. For such a use case, it is <i>required</i> * creating mail attachments. For such a use case, it is <i>required</i>
* that each {@code getInputStream()} call returns a fresh stream. * that each {@code getInputStream()} call returns a fresh stream.
* @return the input stream for the underlying resource (must not be {@code null}) * @return the input stream for the underlying resource (must not be {@code null})
* @throws java.io.FileNotFoundException if the underlying resource doesn't exist * @throws java.io.FileNotFoundException if the underlying resource does not exist
* @throws IOException if the content stream could not be opened * @throws IOException if the content stream could not be opened
* @see Resource#isReadable()
*/ */
InputStream getInputStream() throws IOException; InputStream getInputStream() throws IOException;

8
spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 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.
@ -16,6 +16,7 @@
package org.springframework.orm.hibernate5; package org.springframework.orm.hibernate5;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -320,7 +321,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
Resource[] resources = this.resourcePatternResolver.getResources(pattern); Resource[] resources = this.resourcePatternResolver.getResources(pattern);
MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver); MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver);
for (Resource resource : resources) { for (Resource resource : resources) {
if (resource.isReadable()) { try {
MetadataReader reader = readerFactory.getMetadataReader(resource); MetadataReader reader = readerFactory.getMetadataReader(resource);
String className = reader.getClassMetadata().getClassName(); String className = reader.getClassMetadata().getClassName();
if (matchesEntityTypeFilter(reader, readerFactory)) { if (matchesEntityTypeFilter(reader, readerFactory)) {
@ -333,6 +334,9 @@ public class LocalSessionFactoryBuilder extends Configuration {
packageNames.add(className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length())); packageNames.add(className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length()));
} }
} }
catch (FileNotFoundException ex) {
// Ignore non-readable resource
}
} }
} }
} }

8
spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 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.
@ -16,6 +16,7 @@
package org.springframework.orm.jpa.persistenceunit; package org.springframework.orm.jpa.persistenceunit;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
@ -585,7 +586,7 @@ public class DefaultPersistenceUnitManager
Resource[] resources = this.resourcePatternResolver.getResources(pattern); Resource[] resources = this.resourcePatternResolver.getResources(pattern);
MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver); MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver);
for (Resource resource : resources) { for (Resource resource : resources) {
if (resource.isReadable()) { try {
MetadataReader reader = readerFactory.getMetadataReader(resource); MetadataReader reader = readerFactory.getMetadataReader(resource);
String className = reader.getClassMetadata().getClassName(); String className = reader.getClassMetadata().getClassName();
if (matchesFilter(reader, readerFactory)) { if (matchesFilter(reader, readerFactory)) {
@ -602,6 +603,9 @@ public class DefaultPersistenceUnitManager
className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length())); className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length()));
} }
} }
catch (FileNotFoundException ex) {
// Ignore non-readable resource
}
} }
} }
catch (IOException ex) { catch (IOException ex) {