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

Merge pull request #33013 from biergit 

* pr/33013:
  Polish

Closes gh-33013
This commit is contained in:
Phillip Webb 2022-11-05 18:47:53 -07:00
parent bf468ab808 8d98ae3435
commit a52ca15d9e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java
View File

@ -82,12 +82,12 @@ public final class ImportCandidates implements Iterable<String> {
ClassLoader classLoaderToUse = decideClassloader(classLoader);
String location = String.format(LOCATION, annotation.getName());
Enumeration<URL> urls = findUrlsInClasspath(classLoaderToUse, location);
List<String> autoConfigurations = new ArrayList<>();
List<String> importCandidates = new ArrayList<>();
while (urls.hasMoreElements()) {
URL url = urls.nextElement();
autoConfigurations.addAll(readAutoConfigurations(url));
importCandidates.addAll(readCandidateConfigurations(url));
}
return new ImportCandidates(autoConfigurations);
return new ImportCandidates(importCandidates);
}
private static ClassLoader decideClassloader(ClassLoader classLoader) {
@ -102,15 +102,15 @@ public final class ImportCandidates implements Iterable<String> {
return classLoader.getResources(location);
}
catch (IOException ex) {
throw new IllegalArgumentException("Failed to load autoconfigurations from location [" + location + "]",
throw new IllegalArgumentException("Failed to load configurations from location [" + location + "]",
ex);
}
}
private static List<String> readAutoConfigurations(URL url) {
private static List<String> readCandidateConfigurations(URL url) {
try (BufferedReader reader = new BufferedReader(
new InputStreamReader(new UrlResource(url).getInputStream(), StandardCharsets.UTF_8))) {
List<String> autoConfigurations = new ArrayList<>();
List<String> candidates = new ArrayList<>();
String line;
while ((line = reader.readLine()) != null) {
line = stripComment(line);
@ -118,12 +118,12 @@ public final class ImportCandidates implements Iterable<String> {
if (line.isEmpty()) {
continue;
}
autoConfigurations.add(line);
candidates.add(line);
}
return autoConfigurations;
return candidates;
}
catch (IOException ex) {
throw new IllegalArgumentException("Unable to load autoconfigurations from location [" + url + "]", ex);
throw new IllegalArgumentException("Unable to load configurations from location [" + url + "]", ex);
}
}