lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-05-07 22:28:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be more defensive when extracting filename from URI

Browse Source 
Closes gh-827
This commit is contained in:
Stephane Nicoll 2019-08-12 13:52:34 +02:00
parent 719c368a66
commit f33a661074
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
initializr-generator/src/main/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributor.java
View File

@ -17,6 +17,7 @@
package io.spring.initializr.generator.project.contributor; package io.spring.initializr.generator.project.contributor;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -55,8 +56,8 @@ public class MultipleResourcesProjectContributor implements ProjectContributor {
Resource root = this.resolver.getResource(this.rootResource); Resource root = this.resolver.getResource(this.rootResource);
Resource[] resources = this.resolver.getResources(this.rootResource + "/**"); Resource[] resources = this.resolver.getResources(this.rootResource + "/**");
for (Resource resource : resources) { for (Resource resource : resources) {
String filename = resource.getURI().toString().substring(root.getURI().toString().length() + 1);
if (resource.isReadable()) { if (resource.isReadable()) {
String filename = extractFileName(root.getURI(), resource.getURI());
Path output = projectRoot.resolve(filename); Path output = projectRoot.resolve(filename);
Files.createDirectories(output.getParent()); Files.createDirectories(output.getParent());
Files.createFile(output); Files.createFile(output);
@ -67,4 +68,9 @@ public class MultipleResourcesProjectContributor implements ProjectContributor {
} }
} }
private String extractFileName(URI root, URI resource) {
String candidate = resource.toString().substring(root.toString().length());
return StringUtils.trimLeadingCharacter(candidate, '/');
}
} }