Merge branch '2.0.x'

This commit is contained in:
Marcin Grzejszczak
2018-11-13 19:07:22 +01:00

View File

@@ -23,9 +23,13 @@ import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.FileSystemUtils;
import org.springframework.util.StringUtils;
/**
@@ -156,6 +160,8 @@ public class ContractProjectUpdater {
class DirectoryCopyingVisitor extends SimpleFileVisitor<Path> {
private static final List<String> FOLDERS_TO_DELETE = Arrays.asList("contracts", "mappings");
private static final Log log = LogFactory.getLog(DirectoryCopyingVisitor.class);
private final Path from;
@@ -189,6 +195,16 @@ class DirectoryCopyingVisitor extends SimpleFileVisitor<Path> {
if (log.isDebugEnabled()) {
log.debug("Folder [" + targetPath.toString() + "] already exists");
}
if (FOLDERS_TO_DELETE.contains(targetPath.toFile().getName())) {
if (log.isDebugEnabled()) {
log.debug("Will remove the folder [" + targetPath.toString() + "]");
}
FileSystemUtils.deleteRecursively(targetPath);
Files.createDirectory(targetPath);
if (log.isDebugEnabled()) {
log.debug("Recreated folder [" + targetPath.toString() + "]");
}
}
}
return FileVisitResult.CONTINUE;
}