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

Process URL path for filename extraction if URI does not expose path

Browse Source 
Closes gh-31718
This commit is contained in:
Juergen Hoeller
2023-11-29 17:08:59 +01:00
parent df00aafdff
commit f3b1f37000
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
View File

@@ -302,11 +302,28 @@ class ResourceTests {
@Test
void filenameIsExtractedFromFilePath() throws Exception {
assertThat(new UrlResource("file:test?argh").getFilename()).isEqualTo("test");
assertThat(new UrlResource("file:/test?argh").getFilename()).isEqualTo("test");
assertThat(new UrlResource("file:test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:/test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:/dir/test?argh").getFilename()).isEqualTo("test");
assertThat(new UrlResource("file:/dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:\\dir\\test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:\\dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
}
@Test
void filenameIsExtractedFromURL() throws Exception {
assertThat(new UrlResource(new URL("file:test?argh")).getFilename()).isEqualTo("test");
assertThat(new UrlResource(new URL("file:/test?argh")).getFilename()).isEqualTo("test");
assertThat(new UrlResource(new URL("file:test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:/test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:/dir/test?argh")).getFilename()).isEqualTo("test");
assertThat(new UrlResource(new URL("file:/dir/test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:\\dir\\test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:\\dir/test.txt?argh")).getFilename()).isEqualTo("test.txt");
}
@Test
void filenameContainingHashTagIsExtractedFromFilePathUnencoded() throws Exception {
String unencodedPath = "/dir/test#1.txt";