-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Handle paths with a question mark in them
- Loading branch information
1 parent
2e7e5c9
commit 07bb261
Showing
9 changed files
with
233 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
...c/test/java/io/quarkus/bootstrap/classloader/ClassLoadingPathTreeResourceUrlTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| package io.quarkus.bootstrap.classloader; | ||
|
|
||
| import io.quarkus.bootstrap.classloading.ClassPathElement; | ||
| import io.quarkus.bootstrap.classloading.QuarkusClassLoader; | ||
| import io.quarkus.bootstrap.util.IoUtils; | ||
| import java.io.InputStream; | ||
| import java.net.URL; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.List; | ||
| import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
| import org.jboss.shrinkwrap.api.asset.StringAsset; | ||
| import org.jboss.shrinkwrap.api.exporter.ExplodedExporter; | ||
| import org.jboss.shrinkwrap.api.exporter.ZipExporter; | ||
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.condition.OS; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
|
|
||
| public class ClassLoadingPathTreeResourceUrlTestCase { | ||
|
|
||
| /** | ||
| * URLClassLoader will return URL's that end with a / if the call to getResource ends with a / | ||
| */ | ||
| @ParameterizedTest | ||
| @MethodSource("paths") | ||
| public void testUrlReturnedFromClassLoaderDirectory(String testPath) throws Exception { | ||
| JavaArchive jar = ShrinkWrap.create(JavaArchive.class) | ||
| .add(new StringAsset("a"), "a.txt") | ||
| .add(new StringAsset("b"), "b/b.txt"); | ||
| Path path = Files.createTempDirectory(testPath); | ||
| try { | ||
| jar.as(ExplodedExporter.class).exportExploded(path.toFile(), "tmp"); | ||
|
|
||
| ClassLoader cl = QuarkusClassLoader.builder("test", getClass().getClassLoader(), false) | ||
| .addElement(ClassPathElement.fromPath(path.resolve("tmp"), true)) | ||
| .build(); | ||
| URL res = cl.getResource("a.txt"); | ||
| Assertions.assertNotNull(res); | ||
| Assertions.assertNull(res.getQuery()); | ||
| res = cl.getResource("a.txt/"); | ||
| Assertions.assertNull(res); | ||
|
|
||
| res = cl.getResource("b"); | ||
| Assertions.assertNotNull(res); | ||
| Assertions.assertFalse(res.toExternalForm().endsWith("/")); | ||
|
|
||
| res = cl.getResource("b/"); | ||
| Assertions.assertNotNull(res); | ||
| Assertions.assertTrue(res.toExternalForm().endsWith("/")); | ||
|
|
||
| } finally { | ||
| IoUtils.recursiveDelete(path); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Test that {@link QuarkusClassLoader#getResourceAsStream(String)} returns a stream for directory | ||
| * resources | ||
| * | ||
| * @throws Exception | ||
| * @see <a href="https://github.com/quarkusio/quarkus/issues/11707"/> | ||
| */ | ||
| @ParameterizedTest | ||
| @MethodSource("paths") | ||
| public void testResourceAsStreamForDirectory(String testPath) throws Exception { | ||
| final JavaArchive jar = ShrinkWrap.create(JavaArchive.class) | ||
| .add(new StringAsset("a"), "a.txt") | ||
| .add(new StringAsset("b"), "b/b.txt"); | ||
| final Path tmpDir = Files.createTempDirectory(testPath); | ||
| try { | ||
| jar.as(ExplodedExporter.class).exportExploded(tmpDir.toFile(), "tmpcltest"); | ||
| final ClassLoader cl = QuarkusClassLoader.builder("test", getClass().getClassLoader(), false) | ||
| .addElement(ClassPathElement.fromPath(tmpDir.resolve("tmpcltest"), true)) | ||
| .build(); | ||
|
|
||
| try (final InputStream is = cl.getResourceAsStream("b/")) { | ||
| Assertions.assertNotNull(is, "InputStream is null for a directory resource"); | ||
| } | ||
| try (final InputStream is = cl.getResourceAsStream("b")) { | ||
| Assertions.assertNotNull(is, "InputStream is null for a directory resource"); | ||
| } | ||
| } finally { | ||
| IoUtils.recursiveDelete(tmpDir); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * URLClassLoader will return URL's that end with a / if the call to getResource ends with a / | ||
| */ | ||
| @ParameterizedTest | ||
| @MethodSource("paths") | ||
| public void testUrlReturnedFromClassLoaderJarFile(String testPath) throws Exception { | ||
| JavaArchive jar = ShrinkWrap.create(JavaArchive.class) | ||
| .add(new StringAsset("a"), "a.txt") | ||
| .add(new StringAsset("b"), "b/b.txt"); | ||
| Path path = Files.createTempFile(testPath, "quarkus-test.jar"); | ||
| try { | ||
| jar.as(ZipExporter.class).exportTo(path.toFile(), true); | ||
|
|
||
| ClassLoader cl = QuarkusClassLoader.builder("test", getClass().getClassLoader(), false) | ||
| .addElement(ClassPathElement.fromPath(path, true)) | ||
| .build(); | ||
| URL res = cl.getResource("a.txt"); | ||
| Assertions.assertNotNull(res); | ||
| Assertions.assertNull(res.getQuery()); | ||
| res = cl.getResource("a.txt/"); | ||
| Assertions.assertNull(res); | ||
|
|
||
| res = cl.getResource("b"); | ||
| Assertions.assertNotNull(res); | ||
| Assertions.assertFalse(res.toExternalForm().endsWith("/")); | ||
|
|
||
| res = cl.getResource("b/"); | ||
| Assertions.assertNotNull(res); | ||
| Assertions.assertTrue(res.toExternalForm().endsWith("/")); | ||
|
|
||
| } finally { | ||
| IoUtils.recursiveDelete(path); | ||
| } | ||
| } | ||
|
|
||
| public static Iterable<Object[]> paths() { | ||
| if (OS.WINDOWS.isCurrentOs()) { | ||
| return List.<Object[]> of(new Object[] { "test" }); | ||
| } | ||
| return List.<Object[]> of(new Object[] { "test" }, new Object[] { "dir?with?question?mark" }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...on-tests/maven/src/test/java/io/quarkus/maven/it/QuestionMarkInPathIntegrationTestIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package io.quarkus.maven.it; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.apache.maven.shared.invoker.MavenInvocationException; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.condition.DisabledOnOs; | ||
| import org.junit.jupiter.api.condition.OS; | ||
|
|
||
| @DisableForNative | ||
| @DisabledOnOs(OS.WINDOWS) | ||
| public class QuestionMarkInPathIntegrationTestIT extends QuarkusITBase { | ||
|
|
||
| @Test | ||
| public void testFastJar() throws MavenInvocationException, IOException { | ||
| doTest("qit?fast?jar", "fastjar"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testLegacyJar() throws MavenInvocationException, IOException { | ||
| doTest("qit?legacy?jar", "legacyjar"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUberJar() throws MavenInvocationException, IOException { | ||
| doTest("qit?uber?jar", "uberjar"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters