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

Test for explicit URI decoding in convertClassLoaderURL

Browse Source 
See gh-30031
This commit is contained in:
Juergen Hoeller
2023-03-02 13:33:53 +01:00
parent f8cb0fa2a0
commit 8d112b8514
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
@@ -29,6 +30,7 @@ import java.util.stream.Collectors;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;
@@ -59,7 +61,7 @@ class PathMatchingResourcePatternResolverTests {
private static final String[] CLASSES_IN_REACTOR_UTIL_ANNOTATION = { "NonNull.class", "NonNullApi.class", "Nullable.class" };
private final PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
@Nested
@@ -88,8 +90,16 @@ class PathMatchingResourcePatternResolverTests {
assertFilenames(pattern, expectedFilenames);
}
@Test
void encodedHashtagInPath() throws IOException {
Path rootDir = Paths.get("src/test/resources/custom%23root").toAbsolutePath();
URL root = new URL("file:" + rootDir + "/");
resolver = new PathMatchingResourcePatternResolver(new DefaultResourceLoader(new URLClassLoader(new URL[] {root})));
assertExactFilenames("classpath*:scanned/*.txt", "resource#test1.txt", "resource#test2.txt");
}
@Nested
class WithHashtagsInTheirFileNames {
class WithHashtagsInTheirFilenames {
@Test
void usingClasspathStarProtocol() {

1
spring-core/src/test/resources/custom#root/scanned/resource#test1.txt Normal file
View File

@@ -0,0 +1 @@
test 1

1
spring-core/src/test/resources/custom#root/scanned/resource#test2.txt Normal file
View File

@@ -0,0 +1 @@
test 2