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

Always register root directory for registered resource hints

Browse Source 
See gh-29403
This commit is contained in:
Sam Brannen
2022-10-31 14:20:45 +01:00
parent ca33752267
commit c3fca0a826
7 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-core/src/main/java/org/springframework/aot/hint/ResourcePatternHints.java
View File

@@ -98,20 +98,15 @@ public final class ResourcePatternHints {
* @see <a href="https://github.com/spring-projects/spring-framework/issues/29403">gh-29403</a>
*/
private List<String> expandToIncludeDirectories(String includePattern) {
// Root resource or no explicit subdirectories?
// Resource in root or no explicit subdirectories?
if (!includePattern.contains("/")) {
if (includePattern.contains("*")) {
// If it's a root pattern, include the root directory as well as the pattern
return List.of("/", includePattern);
}
else {
// Include only the root resource
return List.of(includePattern);
}
// Include the root directory as well as the pattern
return List.of("/", includePattern);
}
List<String> includePatterns = new ArrayList<>();
// Ensure the original pattern is always included
// Ensure the root directory and original pattern are always included
includePatterns.add("/");
includePatterns.add(includePattern);
StringBuilder path = new StringBuilder();
for (String pathElement : includePattern.split("/")) {