The Unified and Autonomous Development Platform
refactor: Replace deleteDir with deletePath in file handling across services
Robin Shen5dd52ff987fa
diff --git a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.java b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.javaindex c9312201bb..a7af55ea2f 100644--- a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.java+++ b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.java@@ -167,7 +167,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableT});write(getAttachmentLockName(targetProjectId, attachmentGroup), () -> {try {- FileUtils.deleteDir(targetGroupDir);+ FileUtils.deletePath(targetGroupDir);FileUtils.moveDirectory(tempGroupDir, targetGroupDir);} catch (IOException e) {throw new RuntimeException(e);@@ -175,7 +175,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTreturn null;});} finally {- FileUtils.deleteDir(tempGroupDir);+ FileUtils.deletePath(tempGroupDir);}projectService.directoryModified(targetProjectId, sourceGroupDir.getParentFile());projectService.directoryModified(targetProjectId, targetGroupDir.getParentFile());@@ -194,7 +194,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTwrite(getAttachmentLockName(targetProjectId, attachmentGroup), () -> {try {- FileUtils.deleteDir(targetGroupDir);+ FileUtils.deletePath(targetGroupDir);FileUtils.moveDirectory(tempGroupDir, targetGroupDir);} catch (IOException e) {throw new RuntimeException(e);@@ -202,7 +202,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTreturn null;});} finally {- FileUtils.deleteDir(tempGroupDir);+ FileUtils.deletePath(tempGroupDir);}projectService.directoryModified(targetProjectId, targetGroupDir.getParentFile());}@@ -216,7 +216,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTfor (var attachmentGroup: attachmentGroups) {var sourceGroupDir = getPermanentAttachmentGroupDir(sourceBaseDir, attachmentGroup);write(getAttachmentLockName(sourceProjectId, attachmentGroup), () -> {- FileUtils.deleteDir(sourceGroupDir);+ FileUtils.deletePath(sourceGroupDir);return null;});projectService.directoryModified(sourceProjectId, sourceGroupDir.getParentFile());@@ -257,14 +257,14 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableT});write(getAttachmentLockName(targetProjectId, targetAttachmentGroup), () -> {try {- FileUtils.deleteDir(targetGroupDir);+ FileUtils.deletePath(targetGroupDir);FileUtils.moveDirectory(tempGroupDir, targetGroupDir);} catch (IOException e) {throw new RuntimeException(e);}});} finally {- FileUtils.deleteDir(tempGroupDir);+ FileUtils.deletePath(tempGroupDir);}projectService.directoryModified(targetProjectId, targetGroupDir.getParentFile());}@@ -280,14 +280,14 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTsourceProjectId, sourceIssue.getAttachmentGroup());write(getAttachmentLockName(targetProjectId, targetIssue.getAttachmentGroup()), () -> {try {- FileUtils.deleteDir(targetGroupDir);+ FileUtils.deletePath(targetGroupDir);FileUtils.moveDirectory(tempGroupDir, targetGroupDir);} catch (IOException e) {throw new RuntimeException(e);}});} finally {- FileUtils.deleteDir(tempGroupDir);+ FileUtils.deletePath(tempGroupDir);}projectService.directoryModified(targetProjectId, targetGroupDir.getParentFile());}@@ -369,7 +369,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTif (tempAttachmentBase.exists()) {for (File attachmentGroupDir: tempAttachmentBase.listFiles()) {if (System.currentTimeMillis() - attachmentGroupDir.lastModified() > TEMP_PRESERVE_PERIOD) {- FileUtils.deleteDir(attachmentGroupDir);+ FileUtils.deletePath(attachmentGroupDir);}}}@@ -517,7 +517,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTFile attachmentDir = getPermanentAttachmentGroupDir(projectService.getAttachmentDir(storageSupport.getAttachmentProject().getId()),attachmentGroup);- FileUtils.deleteDir(attachmentDir);+ FileUtils.deletePath(attachmentDir);projectService.directoryModified(projectId, attachmentDir.getParentFile());return null;});@@ -612,7 +612,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableT}if (ex != null) {if (file.exists())- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);throw ExceptionUtils.unchecked(ex);} else {if (!attachmentDir.getParentFile().getName().equals(TEMP))@@ -644,7 +644,7 @@ public class DefaultAttachmentService implements AttachmentService, SchedulableTvar attachmentGroupDir = getAttachmentGroupDir(projectId, attachmentGroup);File attachmentFile = new File(attachmentGroupDir, attachment);if (attachmentFile.exists()) {- FileUtils.deleteFile(attachmentFile);+ FileUtils.deletePath(attachmentFile);projectService.directoryModified(projectId, attachmentGroupDir);}return null;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.javaindex f86b6c9cb0..19ee733711 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java@@ -412,7 +412,7 @@ public class PullRepository extends SyncRepository {} finally {SecretMasker.pop();if (certificateFile != null)- FileUtils.deleteFile(certificateFile);+ FileUtils.deletePath(certificateFile);}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.javaindex 20b0d30cf0..3b838262d6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java@@ -167,7 +167,7 @@ public class PushRepository extends SyncRepository {} finally {SecretMasker.pop();if (certificateFile != null)- FileUtils.deleteFile(certificateFile);+ FileUtils.deletePath(certificateFile);}return new ServerStepResult(true);});diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.javaindex 2169f3ed19..147e127143 100644--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java@@ -333,7 +333,7 @@ public class ClusterResource {commitInfoService.export(projectId, tempDir);TarUtils.tar(tempDir, os, false);} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}};return ok(output).build();@@ -352,7 +352,7 @@ public class ClusterResource {visitInfoService.export(projectId, tempDir);TarUtils.tar(tempDir, os, false);} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}};return ok(output).build();diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.javaindex 27ffb2dc10..29161d0f31 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java@@ -80,7 +80,7 @@ public class BackupDatabase extends CommandHandler {} catch (Exception e) {throw ExceptionUtils.unchecked(e);} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}logger.info("Database is successfully backed up to {}", backupFile.getAbsolutePath());diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/CommandHandler.java b/server-core/src/main/java/io/onedev/server/commandhandler/CommandHandler.javaindex d415685772..48fda08bb3 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/CommandHandler.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/CommandHandler.java@@ -39,7 +39,7 @@ public abstract class CommandHandler extends AbstractPlugin {waitForServerStop();return callWithProbe(callable);} finally {- FileUtils.deleteFile(maintenanceFile);+ FileUtils.deletePath(maintenanceFile);}});}@@ -49,7 +49,7 @@ public abstract class CommandHandler extends AbstractPlugin {waitForServerStop();return callWithProbe(callable);} finally {- FileUtils.deleteFile(maintenanceFile);+ FileUtils.deletePath(maintenanceFile);}}} catch (Exception e) {diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.javaindex 7ff3e5a1b3..10ea2149a6 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java@@ -73,7 +73,7 @@ public class RestoreDatabase extends CommandHandler {ZipUtils.unzip(backupFile, dataDir);doRestore(dataDir);} finally {- FileUtils.deleteDir(dataDir);+ FileUtils.deletePath(dataDir);}} else {doRestore(backupFile);diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.javaindex 1d6bb953e1..4bc54fccbe 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java@@ -262,7 +262,7 @@ public class Upgrade extends AbstractPlugin {File destDir = new File(upgradeDir, "site/lib");FileUtils.createDir(destDir);FileUtils.copyFileToDirectory(file, destDir);- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} catch (IOException e) {throw new RuntimeException(e);}@@ -358,7 +358,7 @@ public class Upgrade extends AbstractPlugin {if (ret == 0) {dbChanged = true;if (isHSQL) {- FileUtils.deleteDir(new File(upgradeDir, "internaldb"), 3);+ FileUtils.deletePath(new File(upgradeDir, "internaldb"), 3);} else {logger.info("Cleaning database with old program...");@@ -458,7 +458,7 @@ public class Upgrade extends AbstractPlugin {FileUtils.createDir(new File(upgradeDir, "site/assets/root"));restoreExecutables(upgradeDir);- FileUtils.deleteDir(programBackup);+ FileUtils.deletePath(programBackup);logger.info("Old program files restored");programRestored = true;@@ -507,7 +507,7 @@ public class Upgrade extends AbstractPlugin {throw new ExplicitException(errorMessage.toString());} else {logger.info("Successfully upgraded {}", upgradeDir.getAbsolutePath());- FileUtils.deleteDir(programBackup);+ FileUtils.deletePath(programBackup);}return null;}@@ -527,7 +527,7 @@ public class Upgrade extends AbstractPlugin {callable.call();}} finally {- FileUtils.deleteFile(maintenanceFile);+ FileUtils.deletePath(maintenanceFile);}System.exit(0);} catch (Exception e) {@@ -582,22 +582,19 @@ public class Upgrade extends AbstractPlugin {for (var destChildFile: destFile.listFiles()) {var srcChildFile = new File(srcFile, destChildFile.getName());if (!srcChildFile.exists()) {- if (destChildFile.isFile())- FileUtils.deleteFile(destChildFile);- else- FileUtils.deleteDir(destChildFile);+ FileUtils.deletePath(destChildFile);}}} else {if (destFile.isFile())- FileUtils.deleteFile(destFile);+ FileUtils.deletePath(destFile);FileUtils.createDir(destFile);}for (var srcChildFile: srcFile.listFiles())restoreProgramFiles(srcChildFile, new File(destFile, srcChildFile.getName()));} else try {if (destFile.isDirectory())- FileUtils.deleteDir(destFile);+ FileUtils.deletePath(destFile);if (destFile.exists()) {if (destFile.canWrite())FileUtils.copyFile(srcFile, destFile);@@ -671,23 +668,23 @@ public class Upgrade extends AbstractPlugin {}if (new File(upgradeDir, "bin/apply_db_constraints.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.bat"));+ FileUtils.deletePath(new File(upgradeDir, "bin/apply_db_constraints.bat"));if (new File(upgradeDir, "bin/apply_db_constraints.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.sh"));+ FileUtils.deletePath(new File(upgradeDir, "bin/apply_db_constraints.sh"));if (new File(upgradeDir, "bin/backup.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/backup.bat"));+ FileUtils.deletePath(new File(upgradeDir, "bin/backup.bat"));if (new File(upgradeDir, "bin/backup.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/backup.sh"));+ FileUtils.deletePath(new File(upgradeDir, "bin/backup.sh"));if (new File(upgradeDir, "bin/restore.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/restore.bat"));+ FileUtils.deletePath(new File(upgradeDir, "bin/restore.bat"));if (new File(upgradeDir, "bin/restore.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/restore.sh"));+ FileUtils.deletePath(new File(upgradeDir, "bin/restore.sh"));if (new File(upgradeDir, "bin/reset_admin_password.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.bat"));+ FileUtils.deletePath(new File(upgradeDir, "bin/reset_admin_password.bat"));if (new File(upgradeDir, "bin/reset_admin_password.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.sh"));+ FileUtils.deletePath(new File(upgradeDir, "bin/reset_admin_password.sh"));- FileUtils.deleteDir(new File(upgradeDir, "status"));+ FileUtils.deletePath(new File(upgradeDir, "status"));cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));cleanAndCopy(new File(Bootstrap.installDir, "agent"), new File(upgradeDir, "agent"));@@ -709,7 +706,7 @@ public class Upgrade extends AbstractPlugin {FileUtils.copyFile(new File(upgradeDir, "site/robots.txt"),new File(upgradeDir, "site/assets/robots.txt"));- FileUtils.deleteFile(new File(upgradeDir, "site/robots.txt"));+ FileUtils.deletePath(new File(upgradeDir, "site/robots.txt"));} catch (IOException e) {throw new RuntimeException(e);}@@ -719,7 +716,7 @@ public class Upgrade extends AbstractPlugin {FileUtils.copyFile(new File(upgradeDir, "site/logo.png"),new File(upgradeDir, "site/assets/logo.png"));- FileUtils.deleteFile(new File(upgradeDir, "site/logo.png"));+ FileUtils.deletePath(new File(upgradeDir, "site/logo.png"));} catch (IOException e) {throw new RuntimeException(e);}@@ -729,7 +726,7 @@ public class Upgrade extends AbstractPlugin {FileUtils.copyDirectory(new File(upgradeDir, "site/avatars"),new File(upgradeDir, "site/assets/avatars"));- FileUtils.deleteDir(new File(upgradeDir, "site/avatars"));+ FileUtils.deletePath(new File(upgradeDir, "site/avatars"));} catch (IOException e) {throw new RuntimeException(e);}@@ -766,7 +763,7 @@ public class Upgrade extends AbstractPlugin {FileUtils.copyFile(new File(upgradeDir, "site/assets/robots.txt"),new File(assetsRootDir, "robots.txt"));- FileUtils.deleteFile(new File(upgradeDir, "site/assets/robots.txt"));+ FileUtils.deletePath(new File(upgradeDir, "site/assets/robots.txt"));} catch (IOException e) {throw new RuntimeException(e);}@@ -780,7 +777,7 @@ public class Upgrade extends AbstractPlugin {}}- FileUtils.deleteDir(assetsRootDir);+ FileUtils.deletePath(assetsRootDir);File usersDir = new File(upgradeDir, "site/users");if (usersDir.exists()) {@@ -790,7 +787,7 @@ public class Upgrade extends AbstractPlugin {if (oldVisitInfoDir.exists() && projectDir.exists()) {File newVisitInfoDir = new File(projectDir, "info/visit");FileUtils.createDir(newVisitInfoDir.getParentFile());- FileUtils.deleteDir(newVisitInfoDir);+ FileUtils.deletePath(newVisitInfoDir);try {FileUtils.moveDirectory(oldVisitInfoDir, newVisitInfoDir);} catch (IOException e) {@@ -798,9 +795,9 @@ public class Upgrade extends AbstractPlugin {}}}- FileUtils.deleteDir(usersDir);+ FileUtils.deletePath(usersDir);}- FileUtils.deleteDir(new File(upgradeDir, "site/info"));+ FileUtils.deletePath(new File(upgradeDir, "site/info"));}var directoryVersion = ".onedev-directory-version";@@ -834,7 +831,7 @@ public class Upgrade extends AbstractPlugin {} catch (IOException e) {throw new RuntimeException(e);}- FileUtils.deleteDir(buildDir);+ FileUtils.deletePath(buildDir);}}}@@ -937,7 +934,7 @@ public class Upgrade extends AbstractPlugin {if (userDir.isDirectory()) {var workspaceDataDir = new File(userDir, "workspace-data");if (workspaceDataDir.exists())- FileUtils.deleteDir(workspaceDataDir);+ FileUtils.deletePath(workspaceDataDir);}}}@@ -951,7 +948,7 @@ public class Upgrade extends AbstractPlugin {if (projectDir.isDirectory()) {var workspaceLogsDir = new File(projectDir, "workspace-logs");if (workspaceLogsDir.exists())- FileUtils.deleteDir(workspaceLogsDir);+ FileUtils.deletePath(workspaceLogsDir);}}}@@ -1089,7 +1086,7 @@ public class Upgrade extends AbstractPlugin {File sampleKeystoreFile = new File(upgradeDir, "conf/sample.keystore");if (sampleKeystoreFile.exists())- FileUtils.deleteFile(sampleKeystoreFile);+ FileUtils.deletePath(sampleKeystoreFile);var logbackConfigFile = new File(upgradeDir, "conf/logback.xml");var logbackConfig = FileUtils.readFileToString(logbackConfigFile, UTF_8);@@ -1132,9 +1129,9 @@ public class Upgrade extends AbstractPlugin {FileUtils.createDir(new File(Bootstrap.installDir, INCOMPATIBILITIES_FILE).getParentFile());if (new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION_FILE).exists())- FileUtils.deleteFile(new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION_FILE));+ FileUtils.deletePath(new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION_FILE));if (new File(upgradeDir, CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION_FILE).exists())- FileUtils.deleteFile(new File(upgradeDir, CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION_FILE));+ FileUtils.deletePath(new File(upgradeDir, CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION_FILE));List<String> incompatibilities = FileUtils.readLines(new File(Bootstrap.installDir, INCOMPATIBILITIES_FILE), UTF_8);if (new File(upgradeDir, INCOMPATIBILITIES_FILE).exists()) {diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.javaindex a58c6a0e99..6f9de6cdd0 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java@@ -603,7 +603,7 @@ public class DefaultDataService implements DataService, Serializable {throw new RuntimeException(e);} finally {if (tempFile != null)- FileUtils.deleteFile(tempFile);+ FileUtils.deletePath(tempFile);}}@@ -988,7 +988,7 @@ public class DefaultDataService implements DataService, Serializable {notifyBackupError(e);throw ExceptionUtils.unchecked(e);} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}}}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex d7638e4f6b..89e0635bf4 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -235,7 +235,7 @@ public class DataMigrator {|| file.getName().startsWith("CodeCommentRelations.xml")|| file.getName().startsWith("CodeCommentReplys.xml")|| file.getName().startsWith("CodeCommentStatusChanges.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("PullRequestUpdates.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {@@ -330,7 +330,7 @@ public class DataMigrator {|| file.getName().startsWith("PullRequest")|| file.getName().startsWith("Review")|| file.getName().startsWith("ReviewInvitation")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("Configs.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {@@ -344,7 +344,7 @@ public class DataMigrator {for (File projectDir : projectsDir.listFiles()) {File infoDir = new File(projectDir, "info");if (infoDir.exists())- FileUtils.deleteDir(infoDir);+ FileUtils.deletePath(infoDir);}}} else if (element.elementText("key").equals("SECURITY")) {@@ -364,7 +364,7 @@ public class DataMigrator {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("CodeComments.xml") || file.getName().startsWith("CodeCommentReplys.xml")|| file.getName().startsWith("CodeCommentStatusChanges.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("Projects.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {@@ -618,7 +618,7 @@ public class DataMigrator {|| file.getName().startsWith("PullRequestTasks.xml")|| file.getName().startsWith("ReviewInvitations.xml")|| file.getName().startsWith("Reviews.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("UserAuthorizations.xml") || file.getName().startsWith("GroupAuthorizations.xml")) {try {String content = FileUtils.readFileToString(file, UTF_8);@@ -720,7 +720,7 @@ public class DataMigrator {}}}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);dom.writeToFile(new File(file.getParentFile(), file.getName().replace("Config", "Setting")), false);} else if (file.getName().startsWith("PullRequestWatchs.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -814,7 +814,7 @@ public class DataMigrator {private void migrate17(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("Issue")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("Projects.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {@@ -1236,7 +1236,7 @@ public class DataMigrator {|| file.getName().startsWith("Build2s.xml")|| file.getName().startsWith("BuildDependences.xml")|| file.getName().startsWith("BuildParams.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("IssueFieldEntitys.xml")) {String content;try {@@ -1247,7 +1247,7 @@ public class DataMigrator {content = content.replace("io.onedev.server.model.IssueFieldEntity","io.onedev.server.model.IssueField");- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);File renamedFile = new File(dataDir, file.getName().replace("IssueFieldEntitys.xml", "IssueFields.xml"));@@ -1290,7 +1290,7 @@ public class DataMigrator {}dom.writeToFile(file, false);} else if (file.getName().startsWith("IssueChanges.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}}@@ -1379,7 +1379,7 @@ public class DataMigrator {}dom.writeToFile(file, false);} else if (file.getName().startsWith("IssueChanges.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}}@@ -2116,12 +2116,12 @@ public class DataMigrator {element.addElement("submitReason").setText("Unknown");dom.writeToFile(file, false);} else if (file.getName().startsWith("CodeCommentRelations.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("PullRequestBuilds.xml")) {try {String content = FileUtils.readFileToString(file, UTF_8.name());content = Strings.CS.replace(content, "PullRequestBuild", "PullRequestVerification");- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);String newFileName = Strings.CS.replace(file.getName(), "PullRequestBuild", "PullRequestVerification");FileUtils.writeFile(new File(dataDir, newFileName), content, UTF_8);} catch (IOException e) {@@ -2873,7 +2873,7 @@ public class DataMigrator {}userQueryWatchesElement.detach();}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);dom.writeToFile(new File(dataDir, file.getName().replace("Settings", "Personalizations")), false);} else if (file.getName().startsWith("PullRequestQuerySettings.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -2894,7 +2894,7 @@ public class DataMigrator {}userQueryWatchesElement.detach();}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);dom.writeToFile(new File(dataDir, file.getName().replace("Settings", "Personalizations")), false);} else if (file.getName().startsWith("BuildQuerySettings.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -2912,7 +2912,7 @@ public class DataMigrator {}userQuerySubscriptionsElement.detach();}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);dom.writeToFile(new File(dataDir, file.getName().replace("Settings", "Personalizations")), false);} else if (file.getName().startsWith("CodeCommentQuerySettings.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -2920,7 +2920,7 @@ public class DataMigrator {element.setName("io.onedev.server.model.CodeCommentQueryPersonalization");element.element("userQueries").setName("queries");}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);dom.writeToFile(new File(dataDir, file.getName().replace("Settings", "Personalizations")), false);} else if (file.getName().startsWith("CommitQuerySettings.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -2939,7 +2939,7 @@ public class DataMigrator {}userQuerySubscriptionsElement.detach();}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);dom.writeToFile(new File(dataDir, file.getName().replace("Settings", "Personalizations")), false);}}@@ -3088,7 +3088,7 @@ public class DataMigrator {String newFileName = file.getName().replace("Jest", "Unit");dom.writeToFile(new File(dataDir, newFileName), false);- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("CloverMetric.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements())@@ -3096,7 +3096,7 @@ public class DataMigrator {String newFileName = file.getName().replace("Clover", "Coverage");dom.writeToFile(new File(dataDir, newFileName), false);- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("CheckstyleMetric.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements())@@ -3104,7 +3104,7 @@ public class DataMigrator {String newFileName = file.getName().replace("Checkstyle", "Problem");dom.writeToFile(new File(dataDir, newFileName), false);- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}}@@ -4778,7 +4778,7 @@ public class DataMigrator {element.setName("io.onedev.server.model.ProjectDynamics");}}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);String newFileName = file.getName().replace("Update", "Dynamics");dom.writeToFile(new File(file.getParent(), newFileName), false);} else if (file.getName().startsWith("Issues.xml")@@ -5192,7 +5192,7 @@ public class DataMigrator {for (var file : dataDir.listFiles()) {if (file.getName().startsWith("ClusterCredentials.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("Projects.xml")) {var dom = VersionedXmlDoc.fromFile(file);for (var element : dom.getRootElement().elements()) {@@ -5211,7 +5211,7 @@ public class DataMigrator {if (lastCommitDateElement != null)lastCommitDateElement.setName("commit");}- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);dom.writeToFile(new File(dataDir, file.getName().replace("ProjectDynamicss", "ProjectLastEventDates")), false);} else if (file.getName().startsWith("Agents.xml")) {var dom = VersionedXmlDoc.fromFile(file);@@ -5254,7 +5254,7 @@ public class DataMigrator {private void migrate118(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("ClusterServers.xml"))- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}@@ -5264,7 +5264,7 @@ public class DataMigrator {private void migrate120(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("ClusterServers.xml"))- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}@@ -5365,7 +5365,7 @@ public class DataMigrator {} else if (file.getName().startsWith("IssueTouchs.xml")|| file.getName().startsWith("PullRequestTouchs.xml")|| file.getName().startsWith("CodeCommentTouchs.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}@@ -5503,7 +5503,7 @@ public class DataMigrator {private void migrate131(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("CodeCommentTouchs.xml") || file.getName().startsWith("PullRequestTouchs.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("Alerts.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements())@@ -6915,7 +6915,7 @@ public class DataMigrator {}}} else if (file.getName().startsWith("IssueStateHistorys.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}@@ -7537,7 +7537,7 @@ public class DataMigrator {String packStorePath = null;for (File file : dataDir.listFiles()) {if (file.getName().startsWith("PackBlobAuthorizations.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);} else if (file.getName().startsWith("PackBlobs.xml")) {var dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {@@ -8453,7 +8453,7 @@ public class DataMigrator {private void migrate218(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("Chats.xml") || file.getName().startsWith("ChatMessages.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}}@@ -8611,7 +8611,7 @@ public class DataMigrator {}dom.writeToFile(file, false);} else if (file.getName().startsWith("RunCaches.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}}@@ -9147,7 +9147,7 @@ public class DataMigrator {}dom.writeToFile(file, false);} else if (file.getName().startsWith("GitLfsLocks.xml")) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}}diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex 7e55ef3d3e..8b5c7c5f08 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -811,7 +811,7 @@ public class GitUtils {throw new RuntimeException(e);} finally {SecretMasker.pop();- FileUtils.deleteDir(homeDir);+ FileUtils.deletePath(homeDir);}}diff --git a/server-core/src/main/java/io/onedev/server/git/LfsObject.java b/server-core/src/main/java/io/onedev/server/git/LfsObject.javaindex 7069f4f984..dd0faa534c 100644--- a/server-core/src/main/java/io/onedev/server/git/LfsObject.java+++ b/server-core/src/main/java/io/onedev/server/git/LfsObject.java@@ -164,7 +164,7 @@ public class LfsObject implements Serializable {Lock writeLock = getLock().writeLock();writeLock.lock();try {- FileUtils.deleteFile(getFile());+ FileUtils.deletePath(getFile());} finally {writeLock.unlock();}diff --git a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.javaindex 6ee6c5b0be..3887025e96 100644--- a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java+++ b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java@@ -409,7 +409,7 @@ public class DefaultLogService implements LogService, Serializable {public void clear(LoggingSupport loggingSupport) {var identity = loggingSupport.getIdentity();write(identity.getLockName(), () -> {- FileUtils.deleteFile(identity.getFile());+ FileUtils.deletePath(identity.getFile());recentSnippets.remove(identity.getFile());return null;});diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.javaindex a4fb20204a..651d73163c 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java@@ -153,7 +153,7 @@ public class WorkerResource {os.write(bytes);} finally {sessionService.openSession();- FileUtils.deleteDir(filesDir);+ FileUtils.deletePath(filesDir);}};}@@ -171,7 +171,7 @@ public class WorkerResource {TarUtils.tar(tempDir, os, false);} finally {sessionService.openSession();- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}};}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.javaindex 880b560a5e..171ef4979a 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java@@ -284,7 +284,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements BuiclusterService.submitToServer(projectServer, () -> {try {var buildDir = getBuildDir(projectId, buildNumber);- FileUtils.deleteDir(buildDir);+ FileUtils.deletePath(buildDir);projectService.directoryModified(projectId, buildDir.getParentFile());} catch (Throwable e) {var message = "Error deleting build storage directory (project id: %d, build number: %d)"@@ -1185,9 +1185,9 @@ public class DefaultBuildService extends BaseEntityService<Build> implements BuiFile artifactFile = new File(artifactsDir, artifactPath);if (artifactFile.exists()) {if (artifactFile.isFile())- FileUtils.deleteFile(artifactFile);+ FileUtils.deletePath(artifactFile);else- FileUtils.deleteDir(artifactsDir);+ FileUtils.deletePath(artifactsDir);} else {String errorMessage = String.format("Unable to find specified artifact (project: %s, build number: %d, artifact path: %s)",diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.javaindex 6a6f7438d9..d17dde31ec 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.java@@ -224,7 +224,7 @@ public class DefaultPackBlobService extends BaseEntityService<PackBlob>var blobFile = getPackBlobFile(projectId, sha256Hash);boolean deleted = write(fileLockName, () -> {if (blobFile.exists()) {- FileUtils.deleteFile(blobFile);+ FileUtils.deletePath(blobFile);return true;} else {return false;@@ -334,7 +334,7 @@ public class DefaultPackBlobService extends BaseEntityService<PackBlob>projectService.runOnActiveServer(projectId, () -> {var uploadFile = getUploadFile(projectId, uuid);if (uploadFile.exists())- FileUtils.deleteFile(uploadFile);+ FileUtils.deletePath(uploadFile);return null;});}@@ -349,7 +349,7 @@ public class DefaultPackBlobService extends BaseEntityService<PackBlob>if (digest.matches(is)) {return new Pair<>(uploadFile.length(), sha256Hash);} else {- FileUtils.deleteFile(uploadFile);+ FileUtils.deletePath(uploadFile);return null;}} else {@@ -367,13 +367,13 @@ public class DefaultPackBlobService extends BaseEntityService<PackBlob>FileUtils.createDir(blobFile.getParentFile());write(getFileLockName(projectId, fileUploadResult.getRight()), () -> {if (blobFile.exists())- FileUtils.deleteFile(blobFile);+ FileUtils.deletePath(blobFile);FileUtils.moveFile(uploadFile, blobFile);return null;});projectService.directoryModified(projectId, blobFile.getParentFile());} else {- FileUtils.deleteFile(uploadFile);+ FileUtils.deletePath(uploadFile);}return null;});@@ -525,7 +525,7 @@ public class DefaultPackBlobService extends BaseEntityService<PackBlob>if (project != null) {for (var uploadFile: projectService.getSubDir(projectId, UPLOADS_DIR).listFiles()) {if (now.getTime() - uploadFile.lastModified() > EXPIRE_MILLIS)- FileUtils.deleteFile(uploadFile);+ FileUtils.deletePath(uploadFile);}}}@@ -553,7 +553,7 @@ public class DefaultPackBlobService extends BaseEntityService<PackBlob>var blobFile = getPackBlobFile(projectId, hash);var deleted = write(getFileLockName(projectId, hash), () -> {if (blobFile.exists()) {- FileUtils.deleteFile(blobFile);+ FileUtils.deletePath(blobFile);return true;} else {return false;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.javaindex 66504ed752..bb4d8b672b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java@@ -813,7 +813,7 @@ public class DefaultProjectService extends BaseEntityService<Project>for (var projectDir: getProjectsDir().listFiles()) {if (new File(projectDir, DELETE_MARK).exists()) {logger.info("Deleting directory marked for deletion: " + projectDir);- FileUtils.deleteDir(projectDir);+ FileUtils.deletePath(projectDir);continue;}if (!NumberUtils.isDigits(projectDir.getName()))@@ -873,7 +873,7 @@ public class DefaultProjectService extends BaseEntityService<Project>return new File(remoteDir, SHARE_TEST_DIR + "/" + testFile.getName()).exists();});} finally {- FileUtils.deleteFile(testFile);+ FileUtils.deletePath(testFile);}}@@ -1381,7 +1381,7 @@ public class DefaultProjectService extends BaseEntityService<Project>FileUtils.createDir(projectDir);initGit(projectId, project.getGitPackConfig());} else {- FileUtils.deleteFile(new File(projectDir, DELETE_MARK));+ FileUtils.deletePath(new File(projectDir, DELETE_MARK));}newReplica.saveType(projectDir);return readVersion(projectDir);diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.javaindex 2a165838ea..8d79b76d68 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java@@ -326,7 +326,7 @@ public class DefaultRunCacheService implements RunCacheService, Serializable, Scpublic void deleteCache(Long projectId, String key, @Nullable String checksum) {var dirName = getDirName(key, checksum);projectService.runOnActiveServer(projectId, () -> write(getLockName(projectId, dirName), () -> {- FileUtils.deleteDir(getCacheDir(projectId, dirName));+ FileUtils.deletePath(getCacheDir(projectId, dirName));return null;}));}@@ -369,12 +369,12 @@ public class DefaultRunCacheService implements RunCacheService, Serializable, Scvar dirName = child.getName();write(getLockName(projectId, dirName), () -> {if (!isCacheDirValid(child)) {- FileUtils.deleteDir(child);+ FileUtils.deletePath(child);return null;}var lastAccessTime = readLastAccessTime(child);if (lastAccessTime < thresholdMillis)- FileUtils.deleteDir(child);+ FileUtils.deletePath(child);return null;});}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.javaindex ce0e461652..ed97345cf2 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java@@ -344,7 +344,7 @@ public class DefaultUserService extends BaseEntityService<User> implements UserSvar userId = user.getId();clusterService.runOnAllServers(() -> {- FileUtils.deleteDir(getUserDir(userId));+ FileUtils.deletePath(getUserDir(userId));return null;});}diff --git a/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java b/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.javaindex d5952f7f4a..b68fadc362 100644--- a/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java@@ -126,10 +126,7 @@ public class SiteSyncUtils {if (remoteChildren.remove(file.getName())) {childSyncer.accept(file.getName());} else if (deleteLocalIfRemoteIsMissing) {- if (file.isFile())- FileUtils.deleteFile(file);- else- FileUtils.deleteDir(file);+ FileUtils.deletePath(file);}}}@@ -194,7 +191,7 @@ public class SiteSyncUtils {try {downloadDirectory(remoteServer, path, tempDir, readLock);if (deleteLocalIfRemoteIsMissing) {- FileUtils.deleteDir(directory);+ FileUtils.deletePath(directory);FileUtils.moveDirectory(tempDir, directory);} else {FileUtils.copyDirectory(tempDir, directory);@@ -203,7 +200,7 @@ public class SiteSyncUtils {} catch (IOException e) {throw new RuntimeException(e);} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}});} else {@@ -256,21 +253,21 @@ public class SiteSyncUtils {var tempFile = FileUtils.createTempFile();try {if (downloadFile(fromServer, path, tempFile, readLock)) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);FileUtils.moveFile(tempFile, file);} else if (deleteLocalIfRemoteIsMissing && file.exists()) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}} catch (IOException e) {throw new RuntimeException(e);} finally {- FileUtils.deleteFile(tempFile);+ FileUtils.deletePath(tempFile);}});} else if (!downloadFile(fromServer, path, file, readLock)&& deleteLocalIfRemoteIsMissing&& file.exists()) {- FileUtils.deleteFile(file);+ FileUtils.deletePath(file);}}diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.javaindex c78e9726d2..d1edc0ba4a 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java@@ -189,10 +189,10 @@ public class DefaultAvatarService implements AvatarService, Serializable {writeToFile(avatarFile, avatarData);} else {if (avatarFile.exists())- FileUtils.deleteFile(avatarFile);+ FileUtils.deletePath(avatarFile);avatarFile = getUserUploadedFile(userId, "jpg");if (avatarFile.exists())- FileUtils.deleteFile(avatarFile);+ FileUtils.deletePath(avatarFile);}SiteSyncUtils.increaseVersion(OneDev.getAssetsDir());return null;@@ -217,10 +217,10 @@ public class DefaultAvatarService implements AvatarService, Serializable {writeToFile(avatarFile, avatarData);} else {if (avatarFile.exists())- FileUtils.deleteFile(avatarFile);+ FileUtils.deletePath(avatarFile);avatarFile = getProjectUploadedFile(projectId, "jpg");if (avatarFile.exists())- FileUtils.deleteFile(avatarFile);+ FileUtils.deletePath(avatarFile);}SiteSyncUtils.increaseVersion(OneDev.getAssetsDir());return null;@@ -269,7 +269,7 @@ public class DefaultAvatarService implements AvatarService, Serializable {}});} finally {- FileUtils.deleteFile(tempFile);+ FileUtils.deletePath(tempFile);}SiteSyncUtils.increaseVersion(OneDev.getAssetsDir());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.javaindex 618fc2aefe..84875d2939 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.java@@ -149,7 +149,7 @@ public class WorkspaceDataPanel extends Panel {clusterService.runOnAllServers(() -> {write(lockName, () -> {var dataDir = userService.getWorkspaceDataDir(userId, key, false);- FileUtils.deleteDir(dataDir);+ FileUtils.deletePath(dataDir);});return null;});diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.javaindex 450cc45947..ed241be07c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java@@ -151,7 +151,7 @@ public class BrandingSettingPage extends AdministrationPage {if (logoBytes != null)FileUtils.writeByteArrayToFile(getCustomLogoFile(darkMode), logoBytes);else- FileUtils.deleteFile(getCustomLogoFile(darkMode));+ FileUtils.deletePath(getCustomLogoFile(darkMode));} catch (IOException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.javaindex 50181a0d43..af9202c85c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java@@ -81,7 +81,7 @@ public class DatabaseBackupPage extends AdministrationPage {databaseManager.exportData(tempDir);ZipUtils.zip(tempDir, attributes.getResponse().getOutputStream());} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.javaindex f626c0fb53..c634e7e886 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.java@@ -37,7 +37,7 @@ public class IncompatibilitiesPage extends LayoutPage {incompatibilitiesSinceUpgradedVersionFile, StandardCharsets.UTF_8);FileUtils.copyFile(incompatibilitiesSinceUpgradedVersionFile,checkedIncompatibilitiesSinceUpgradedVersionFile);- FileUtils.deleteFile(incompatibilitiesSinceUpgradedVersionFile);+ FileUtils.deletePath(incompatibilitiesSinceUpgradedVersionFile);return incompatibilitiesSinceUpgradedVersion;} else if (checkedIncompatibilitiesSinceUpgradedVersionFile.exists()) {return FileUtils.readFileToString(diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.javaindex ca92c75c5e..05c916aa70 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java@@ -54,7 +54,7 @@ public class AgentLibResource extends AbstractResource {TarUtils.tar(tempDir, os, false);}} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}}diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.javaindex 4d2690ce50..014c6d535a 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java@@ -121,7 +121,7 @@ public class AgentResource extends AbstractResource {}}} finally {- FileUtils.deleteDir(tempDir);+ FileUtils.deletePath(tempDir);}}diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.javaindex a42af78ab0..2c69cf87fb 100644--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java@@ -317,7 +317,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>var logFile = getLogFile(projectId, workspaceNumber);if (logFile.exists())- FileUtils.deleteFile(logFile);+ FileUtils.deletePath(logFile);} catch (Throwable t) {var message = "Error deleting workspace storage (project id: %d, workspace number: %d)".formatted(projectId, workspaceNumber);@@ -466,7 +466,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>var workspaceNumber = workspace.getNumber();projectService.runOnActiveServer(projectId, (ClusterTask<Void>) () -> {- FileUtils.deleteFile(getLogFile(projectId, workspaceNumber));+ FileUtils.deletePath(getLogFile(projectId, workspaceNumber));return null;});diff --git a/server-core/src/main/java/io/onedev/server/workspace/ServerProvisionerUtils.java b/server-core/src/main/java/io/onedev/server/workspace/ServerProvisionerUtils.javaindex 33d14891f5..5b935c9092 100644--- a/server-core/src/main/java/io/onedev/server/workspace/ServerProvisionerUtils.java+++ b/server-core/src/main/java/io/onedev/server/workspace/ServerProvisionerUtils.java@@ -48,7 +48,7 @@ public final class ServerProvisionerUtils {OneDev.getInstance(ClusterService.class).runOnServer(pinnedServer, () -> {var workspaceDir = getWorkspaceDir(projectId, workspaceNumber);if (workspaceDir.exists())- FileUtils.deleteDir(workspaceDir, 5);+ FileUtils.deletePath(workspaceDir, 5);return null;});} else {diff --git a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.javaindex 87b7fdfe4b..383087d50a 100644--- a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java+++ b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java@@ -81,7 +81,7 @@ public abstract class AbstractGitTest extends AppLoaderMocker {int retried = 0;while (dir.exists()) {try {- FileUtils.deleteDir(dir);+ FileUtils.deletePath(dir);break;} catch (Exception e) {if (retried++ < retries) {@@ -100,7 +100,7 @@ public abstract class AbstractGitTest extends AppLoaderMocker {@Overrideprotected void teardown() {git.getRepository().close();- FileUtils.deleteDir(gitDir, 3);+ FileUtils.deletePath(gitDir, 3);}protected void createDir(String path) {@@ -108,7 +108,7 @@ public abstract class AbstractGitTest extends AppLoaderMocker {}protected void deleteDir(String path) {- FileUtils.deleteDir(new File(gitDir, path));+ FileUtils.deletePath(new File(gitDir, path));}protected void writeFile(String path, String content) {diff --git a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.javaindex 9d98ecf596..17cca3618e 100644--- a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java@@ -53,7 +53,7 @@ public class GitUtilsTest extends AbstractGitTest {assertTrue(response.contains("does not appear to be a git repository"));assertTrue(response.endsWith("0000"));} finally {- FileUtils.deleteDir(emptyDir);+ FileUtils.deletePath(emptyDir);}}@@ -450,7 +450,7 @@ public class GitUtilsTest extends AbstractGitTest {}}} finally {- FileUtils.deleteDir(tempDir, 3);+ FileUtils.deletePath(tempDir, 3);}}@@ -498,7 +498,7 @@ public class GitUtilsTest extends AbstractGitTest {}}} finally {- FileUtils.deleteDir(tempDir, 3);+ FileUtils.deletePath(tempDir, 3);}}diff --git a/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.java b/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.javaindex b93c928d02..1772427743 100644--- a/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.java+++ b/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.java@@ -121,7 +121,7 @@ public class SignatureVerifierTest {} catch (IOException e) {throw new RuntimeException(e);} finally {- FileUtils.deleteDir(tempDir, 3);+ FileUtils.deletePath(tempDir, 3);}}diff --git a/server-ee b/server-eeindex 7e3b80da81..ebea2c3e5e 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 7e3b80da8123066b0377166f53ac0b3e3ada694a+Subproject commit ebea2c3e5e8c697bd0d6d2a87a49606e912beab6diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex ec876b0f6a..4fe6da3305 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -604,7 +604,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te} finally {SecretMasker.pop();synchronized (buildDir) {- FileUtils.deleteDir(buildDir, 5);+ FileUtils.deletePath(buildDir, 5);}}}diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex 8f62b632d3..bcd7bf0320 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -298,7 +298,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<Testabl} finally {SecretMasker.pop();synchronized (buildDir) {- FileUtils.deleteDir(buildDir, 5);+ FileUtils.deletePath(buildDir, 5);}}}diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.javaindex 43552aa648..dcdb31e704 100644--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java@@ -241,7 +241,7 @@ public class GemPackHandler implements PackHandler {response.setStatus(SC_OK);}));} finally {- FileUtils.deleteFile(tempFile);+ FileUtils.deletePath(tempFile);}} else if (pathSegments.equals(newArrayList("api", "v1", "gems", "yank"))) {if (!isDelete)diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.javaindex 3b370e53f1..b74ffec6de 100644--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java@@ -320,7 +320,7 @@ public class NugetPackHandler implements PackHandler {logger.warn("Package version is not a SemVer v2 compatible version");throw new ClientException(SC_BAD_REQUEST);} finally {- FileUtils.deleteFile(tempFile);+ FileUtils.deletePath(tempFile);}} else {throw new ClientException(SC_BAD_REQUEST);diff --git a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.javaindex 085b3a6015..0e8665b18a 100644--- a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java+++ b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java@@ -353,7 +353,7 @@ public class ServerDockerProvisioner extends WorkspaceProvisioner implements Docvar containerReadyFile = new File(workspaceDir, CONTAINER_READY_FILE);if (containerReadyFile.exists())- FileUtils.deleteFile(containerReadyFile);+ FileUtils.deletePath(containerReadyFile);var docker = newDocker();var runAs = context.getSpec().getRunAs();diff --git a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.javaindex 6797c4bce8..a71e62fbb6 100644--- a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java+++ b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java@@ -122,7 +122,7 @@ public class PublishCoberturaReportStepTest {}assertEquals(CoverageStatus.NOT_COVERED, result.getStatuses().get("/example/src/requests/help.py").get(49));} finally {- FileUtils.deleteDir(inputDir);+ FileUtils.deletePath(inputDir);}}diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.javaindex e330330d9f..92b0d2c177 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java@@ -50,11 +50,11 @@ public abstract class PublishCoverageReportStep extends PublishReportStep {build.getProject().getId(), reportDir.getParentFile());return aResult;} else {- FileUtils.deleteDir(reportDir);+ FileUtils.deletePath(reportDir);return null;}} catch (Exception e) {- FileUtils.deleteDir(reportDir);+ FileUtils.deletePath(reportDir);throw ExceptionUtils.unchecked(e);}});diff --git a/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.java b/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.javaindex f7517673dc..7382f6e68a 100644--- a/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.java+++ b/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.java@@ -57,7 +57,7 @@ public class PublishPlaywrightReportStep extends PublishUnitTestReportStep {protected UnitTestReport process(Build build, File inputDir, TaskLogger logger) {ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);File reportDir = new File(build.getDir(), UnitTestReport.CATEGORY + "/" + getReportName());- FileUtils.deleteDir(reportDir);+ FileUtils.deletePath(reportDir);FileUtils.createDir(reportDir);try {List<TestCase> testCases = new ArrayList<>();@@ -72,11 +72,11 @@ public class PublishPlaywrightReportStep extends PublishUnitTestReportStep {if (!testCases.isEmpty())return new UnitTestReport(testCases, true);else {- FileUtils.deleteDir(reportDir);+ FileUtils.deletePath(reportDir);return null;}} catch (Exception e) {- FileUtils.deleteDir(reportDir);+ FileUtils.deletePath(reportDir);throw ExceptionUtils.unchecked(e);}}diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.javaindex ecb196aed4..61496cb092 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java@@ -68,11 +68,11 @@ public abstract class PublishProblemReportStep extends PublishReportStep {build.getProject().getId(), reportDir.getParentFile());return aReport;} else {- FileUtils.deleteDir(reportDir);+ FileUtils.deletePath(reportDir);return null;}} catch (Exception e) {- FileUtils.deleteDir(reportDir);+ FileUtils.deletePath(reportDir);throw ExceptionUtils.unchecked(e);}});