Test encoding and Unicode normalization for scanned resources

This commit introduces tests which serve as "regression tests" for the
behavior of PathMatchingResourcePatternResolver in Spring Framework
5.3.x with regard to URL-encoding and Unicode normalization of resource
paths.

Specifically, the new tests demonstrate that resource paths do NOT need
to be decoded or normalized in 5.3.x.

See gh-29243
This commit is contained in:
Sam Brannen
2022-10-04 12:29:45 +02:00
parent 8d0ac214f3
commit eb2c1cbcd4
4 changed files with 76 additions and 0 deletions

View File

@@ -0,0 +1,26 @@
/*
* Copyright 2002-2022 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package example.japanese.バリューオブジェクト;
/**
* This class and its package exist in order to test encoding and Unicode
* normalization for resource paths discovered via classpath scanning.
*
* <p>"バリューオブジェクト" is Japanese for "value object".
*/
public class バリューオブジェクト {
}

View File

@@ -105,6 +105,30 @@ class PathMatchingResourcePatternResolverTests {
}
@Nested
class ContainingJapaneseCharactersInTheirPathsAndFileNames {
@Test
void usingClasspathStarProtocol() {
String pattern = "classpath*:example/japanese/バリューオブジェクト/**/*.class";
String pathPrefix = ".+example/japanese/";
assertExactFilenames(pattern, "バリューオブジェクト.class");
assertExactSubPaths(pattern, pathPrefix, "バリューオブジェクト/バリューオブジェクト.class");
}
@Test
void usingFilePrototol() {
Path testResourcesDir = Paths.get("src/test/resources").toAbsolutePath();
String pattern = String.format("file:%s/japanese-resources/バリューオブジェクト/**/*.text", testResourcesDir);
String pathPrefix = ".+japanese-resources/";
assertExactFilenames(pattern, "バリューオブジェクト.text");
assertExactSubPaths(pattern, pathPrefix, "バリューオブジェクト/バリューオブジェクト.text");
}
}
}
@@ -181,4 +205,27 @@ class PathMatchingResourcePatternResolverTests {
}
}
private void assertExactSubPaths(String pattern, String pathPrefix, String... subPaths) {
try {
Resource[] resources = resolver.getResources(pattern);
List<String> actualSubPaths = Arrays.stream(resources)
.map(resource -> getPath(resource).replaceFirst(pathPrefix, ""))
.sorted()
.collect(Collectors.toList());
assertThat(actualSubPaths).containsExactlyInAnyOrder(subPaths);
}
catch (IOException ex) {
throw new UncheckedIOException(ex);
}
}
private String getPath(Resource resource) {
try {
return resource.getURL().getPath();
}
catch (IOException ex) {
throw new UncheckedIOException(ex);
}
}
}