Jar files added after build time should be added to classpath

Fixes gh-19973

Author: mbhave

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ClassPathIndexFile.java

@@ -72,6 +72,13 @@ boolean containsFolder(String name) {
 		return this.folders.contains(name);
 	}
 
+	boolean containsEntry(String name) {
+		if (name == null || name.isEmpty()) {
+			return false;
+		}
+		return this.lines.contains(name);
+	}
+
 	List<URL> getUrls() {
 		return Collections.unmodifiableList(this.lines.stream().map(this::asUrl).collect(Collectors.toList()));
 	}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java

@@ -101,17 +101,18 @@ private int guessClassPathSize() {
 
 	@Override
 	protected Iterator<Archive> getClassPathArchivesIterator() throws Exception {
-		Archive.EntryFilter searchFilter = (entry) -> isSearchCandidate(entry) && !isFolderIndexed(entry);
-		Iterator<Archive> archives = this.archive.getNestedArchives(searchFilter, this::isNestedArchive);
+		Archive.EntryFilter searchFilter = this::isSearchCandidate;
+		Iterator<Archive> archives = this.archive.getNestedArchives(searchFilter,
+				(entry) -> isNestedArchive(entry) && !isEntryIndexed(entry));
 		if (isPostProcessingClassPathArchives()) {
 			archives = applyClassPathArchivePostProcessing(archives);
 		}
 		return archives;
 	}
 
-	private boolean isFolderIndexed(Archive.Entry entry) {
+	private boolean isEntryIndexed(Archive.Entry entry) {
 		if (this.classPathIndex != null) {
-			return this.classPathIndex.containsFolder(entry.getName());
+			return this.classPathIndex.containsEntry(entry.getName());
 		}
 		return false;
 	}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java

@@ -25,6 +25,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -52,11 +53,12 @@ public abstract class AbstractExecutableArchiveLauncherTests {
 	File tempDir;
 
 	protected File createJarArchive(String name, String entryPrefix) throws IOException {
-		return createJarArchive(name, entryPrefix, false);
+		return createJarArchive(name, entryPrefix, false, Collections.emptyList());
 	}
 
 	@SuppressWarnings("resource")
-	protected File createJarArchive(String name, String entryPrefix, boolean indexed) throws IOException {
+	protected File createJarArchive(String name, String entryPrefix, boolean indexed, List<String> extraLibs)
+			throws IOException {
 		File archive = new File(this.tempDir, name);
 		JarOutputStream jarOutputStream = new JarOutputStream(new FileOutputStream(archive));
 		jarOutputStream.putNextEntry(new JarEntry(entryPrefix + "/"));
@@ -74,6 +76,9 @@ protected File createJarArchive(String name, String entryPrefix, boolean indexed
 		addNestedJars(entryPrefix, "/lib/foo.jar", jarOutputStream);
 		addNestedJars(entryPrefix, "/lib/bar.jar", jarOutputStream);
 		addNestedJars(entryPrefix, "/lib/baz.jar", jarOutputStream);
+		for (String lib : extraLibs) {
+			addNestedJars(entryPrefix, "/lib/" + lib, jarOutputStream);
+		}
 		jarOutputStream.close();
 		return archive;
 	}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/JarLauncherTests.java

@@ -20,6 +20,8 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -72,14 +74,27 @@ void archivedJarHasOnlyBootInfClassesAndContentsOfBootInfLibOnClasspath() throws
 
 	@Test
 	void explodedJarShouldPreserveClasspathOrderWhenIndexPresent() throws Exception {
-		File explodedRoot = explode(createJarArchive("archive.jar", "BOOT-INF", true));
+		File explodedRoot = explode(createJarArchive("archive.jar", "BOOT-INF", true, Collections.emptyList()));
 		JarLauncher launcher = new JarLauncher(new ExplodedArchive(explodedRoot, true));
 		Iterator<Archive> archives = launcher.getClassPathArchivesIterator();
 		URLClassLoader classLoader = (URLClassLoader) launcher.createClassLoader(archives);
 		URL[] urls = classLoader.getURLs();
 		assertThat(urls).containsExactly(getExpectedFileUrls(explodedRoot));
 	}
 
+	@Test
+	void jarFilesPresentInBootInfLibsAndNotInClasspathIndexShouldBeAddedAfterBootInfClasses() throws Exception {
+		ArrayList<String> extraLibs = new ArrayList<>(Arrays.asList("extra-1.jar", "extra-2.jar"));
+		File explodedRoot = explode(createJarArchive("archive.jar", "BOOT-INF", true, extraLibs));
+		JarLauncher launcher = new JarLauncher(new ExplodedArchive(explodedRoot, true));
+		Iterator<Archive> archives = launcher.getClassPathArchivesIterator();
+		URLClassLoader classLoader = (URLClassLoader) launcher.createClassLoader(archives);
+		URL[] urls = classLoader.getURLs();
+		List<File> expectedFiles = getExpectedFilesWithExtraLibs(explodedRoot);
+		URL[] expectedFileUrls = expectedFiles.stream().map(this::toUrl).toArray(URL[]::new);
+		assertThat(urls).containsExactly(expectedFileUrls);
+	}
+
 	protected final URL[] getExpectedFileUrls(File explodedRoot) {
 		return getExpectedFiles(explodedRoot).stream().map(this::toUrl).toArray(URL[]::new);
 	}
@@ -93,4 +108,15 @@ protected final List<File> getExpectedFiles(File parent) {
 		return expected;
 	}
 
+	protected final List<File> getExpectedFilesWithExtraLibs(File parent) {
+		List<File> expected = new ArrayList<>();
+		expected.add(new File(parent, "BOOT-INF/classes"));
+		expected.add(new File(parent, "BOOT-INF/lib/extra-1.jar"));
+		expected.add(new File(parent, "BOOT-INF/lib/extra-2.jar"));
+		expected.add(new File(parent, "BOOT-INF/lib/foo.jar"));
+		expected.add(new File(parent, "BOOT-INF/lib/bar.jar"));
+		expected.add(new File(parent, "BOOT-INF/lib/baz.jar"));
+		return expected;
+	}
+
 }