Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-41970
This commit is contained in:
Scott Frederick
2024-08-20 15:49:25 -05:00
parent 3ac141e290 21b15558a2
commit 0451cb8686
9 changed files with 135 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/AbstractExecutableArchiveLauncherTests.java → spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/AbstractLauncherTests.java
View File

@@ -24,6 +24,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Enumeration;
@@ -40,13 +41,13 @@ import org.junit.jupiter.api.io.TempDir;
import org.springframework.util.FileCopyUtils;
/**
* Base class for testing {@link ExecutableArchiveLauncher} implementations.
* Base class for testing {@link Launcher} implementations.
*
* @author Andy Wilkinson
* @author Madhura Bhave
* @author Scott Frederick
*/
abstract class AbstractExecutableArchiveLauncherTests {
abstract class AbstractLauncherTests {
@TempDir
File tempDir;
@@ -133,4 +134,8 @@ abstract class AbstractExecutableArchiveLauncherTests {
}
}
protected URLClassLoader createClassLoader(Launcher launcher) throws Exception {
return (URLClassLoader) launcher.createClassLoader(launcher.getClassPathUrls());
}
}

6
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/JarLauncherTests.java
View File

@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb
*/
@AssertFileChannelDataBlocksClosed
class JarLauncherTests extends AbstractExecutableArchiveLauncherTests {
class JarLauncherTests extends AbstractLauncherTests {
@Test
void explodedJarHasOnlyBootInfClassesAndContentsOfBootInfLibOnClasspath() throws Exception {
@@ -115,10 +115,6 @@ class JarLauncherTests extends AbstractExecutableArchiveLauncherTests {
}));
}
private URLClassLoader createClassLoader(JarLauncher launcher) throws Exception {
return (URLClassLoader) launcher.createClassLoader(launcher.getClassPathUrls());
}
private URL[] getExpectedFileUrls(File explodedRoot) {
return getExpectedFiles(explodedRoot).stream().map(this::toUrl).toArray(URL[]::new);
}

62
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/PropertiesLauncherTests.java
View File

@@ -22,7 +22,9 @@ import java.io.InputStream;
import java.net.URL;
import java.net.URLClassLoader;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -38,7 +40,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
import org.springframework.boot.loader.net.protocol.jar.JarUrl;
import org.springframework.boot.loader.testsupport.TestJar;
@@ -58,13 +59,11 @@ import static org.hamcrest.Matchers.containsString;
*
* @author Dave Syer
* @author Andy Wilkinson
* @author Scott Frederick
*/
@ExtendWith(OutputCaptureExtension.class)
@AssertFileChannelDataBlocksClosed
class PropertiesLauncherTests {
@TempDir
File tempDir;
class PropertiesLauncherTests extends AbstractLauncherTests {
private PropertiesLauncher launcher;
@@ -388,13 +387,66 @@ class PropertiesLauncherTests {
this.launcher = new PropertiesLauncher(archive);
this.launcher.launch(new String[0]);
waitFor("Hello World");
}
@Test
void explodedJarShouldPreserveClasspathOrderWhenIndexPresent() throws Exception {
File explodedRoot = explode(createJarArchive("archive.jar", "BOOT-INF", true, Collections.emptyList()));
PropertiesLauncher launcher = new PropertiesLauncher(new ExplodedArchive(explodedRoot));
URLClassLoader classLoader = createClassLoader(launcher);
assertThat(classLoader.getURLs()).containsExactly(getExpectedFileUrls(explodedRoot));
}
@Test
void customClassLoaderAndExplodedJarAndShouldPreserveClasspathOrderWhenIndexPresent() throws Exception {
System.setProperty("loader.classLoader", URLClassLoader.class.getName());
File explodedRoot = explode(createJarArchive("archive.jar", "BOOT-INF", true, Collections.emptyList()));
PropertiesLauncher launcher = new PropertiesLauncher(new ExplodedArchive(explodedRoot));
URLClassLoader classLoader = createClassLoader(launcher);
assertThat(classLoader.getParent()).isInstanceOf(URLClassLoader.class);
assertThat(((URLClassLoader) classLoader.getParent()).getURLs())
.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));
PropertiesLauncher launcher = new PropertiesLauncher(new ExplodedArchive(explodedRoot));
URLClassLoader classLoader = createClassLoader(launcher);
List<File> expectedFiles = getExpectedFilesWithExtraLibs(explodedRoot);
URL[] expectedFileUrls = expectedFiles.stream().map(this::toUrl).toArray(URL[]::new);
assertThat(classLoader.getURLs()).containsExactly(expectedFileUrls);
}
private void waitFor(String value) {
Awaitility.waitAtMost(Duration.ofSeconds(5)).until(this.output::toString, containsString(value));
}
private URL[] getExpectedFileUrls(File explodedRoot) {
return getExpectedFiles(explodedRoot).stream().map(this::toUrl).toArray(URL[]::new);
}
private List<File> getExpectedFiles(File parent) {
List<File> expected = new ArrayList<>();
expected.add(new File(parent, "BOOT-INF/classes"));
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;
}
private 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;
}
private Condition<URL> endingWith(String value) {
return new Condition<>() {

6
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/WarLauncherTests.java
View File

@@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb
*/
@AssertFileChannelDataBlocksClosed
class WarLauncherTests extends AbstractExecutableArchiveLauncherTests {
class WarLauncherTests extends AbstractLauncherTests {
@Test
void explodedWarHasOnlyWebInfClassesAndContentsOfWebInfLibOnClasspath() throws Exception {
@@ -86,10 +86,6 @@ class WarLauncherTests extends AbstractExecutableArchiveLauncherTests {
assertThat(urls).containsExactly(expectedFileUrls);
}
private URLClassLoader createClassLoader(Launcher launcher) throws Exception {
return (URLClassLoader) launcher.createClassLoader(launcher.getClassPathUrls());
}
private URL[] getExpectedFileUrls(File explodedRoot) {
return getExpectedFiles(explodedRoot).stream().map(this::toUrl).toArray(URL[]::new);
}