spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Improve classpath lookup in IndexedJarStructure

Browse Source 
See gh-51787

Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>
This commit is contained in:
Hyunwoo Jung
2026-09-17 09:06:54 +01:00
committed by Andy Wilkinson
parent 617e08b5b1
commit fabfdd5dc7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loader/spring-boot-jarmode-tools/src/main/java/org/springframework/boot/jarmode/tools/IndexedJarStructure.java
+4 -4
View File
@@ -21,8 +21,8 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.NoSuchFileException; import java.nio.file.NoSuchFileException;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.function.UnaryOperator; import java.util.function.UnaryOperator;
@@ -60,7 +60,7 @@ class IndexedJarStructure implements JarStructure {
private final String classesLocation; private final String classesLocation;
private final List<String> classpathEntries; private final Set<String> classpathEntries;
IndexedJarStructure(Manifest originalManifest, String indexFile) { IndexedJarStructure(Manifest originalManifest, String indexFile) {
this.originalManifest = originalManifest; this.originalManifest = originalManifest;
@@ -74,12 +74,12 @@ class IndexedJarStructure implements JarStructure {
return (!location.endsWith("/")) ? location + "/" : location; return (!location.endsWith("/")) ? location + "/" : location;
} }
private static List<String> readIndexFile(String indexFile) { private static Set<String> readIndexFile(String indexFile) {
String[] lines = Arrays.stream(indexFile.split("\n")) String[] lines = Arrays.stream(indexFile.split("\n"))
.map((line) -> line.replace("\r", "")) .map((line) -> line.replace("\r", ""))
.filter(StringUtils::hasText) .filter(StringUtils::hasText)
.toArray(String[]::new); .toArray(String[]::new);
List<String> classpathEntries = new ArrayList<>(); Set<String> classpathEntries = new LinkedHashSet<>();
for (String line : lines) { for (String line : lines) {
Assert.state(line.startsWith("- "), "Classpath index file is malformed"); Assert.state(line.startsWith("- "), "Classpath index file is malformed");
classpathEntries.add(line.substring(3, line.length() - 1)); classpathEntries.add(line.substring(3, line.length() - 1));