commit fac8815949114d58b65dceda355bf80f7ec2adee
author Nasser Grainawi <nasser@codeaurora.org> Mon Dec 06 13:02:45 2021 -0700
committer Nasser Grainawi <nasser@codeaurora.org> Mon Dec 06 21:27:13 2021 +0000
tree 37ada182f8f6bef7b43c6656eb696bd8f598523e
parent fed529c129169d21fef98d1209b68b3bc3d10246
parent 612f143792652d571ecfcb19915ad5754a3ba1a7

Merge branch 'stable-3.5'

* stable-3.5:
  Adapt to new ProjectCache interface

Depends-on: https://gerrit-review.googlesource.com/c/gerrit/+/324075
Change-Id: I4a81e47e1bcae476da5ba345bfbba2eaa02181a3

src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
index a444859..53b83f1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
@@ -26,14 +26,6 @@
 
 @CommandMetaData(name = "delete", description = "Delete specific project")
 final class DeleteCommand extends SshCommand {
-  private static final String FORCE_DELETE =
-      "%s - To really delete '%s', re-run with the --force flag.";
-  private static final String REALLY_DELETE =
-      "Really delete '%s'?\n"
-          + "This is an operation which permanently deletes data. This cannot be undone!\n"
-          + "If you are sure you wish to delete this project, re-run with the "
-          + "--yes-really-delete flag.\n";
-
   @Argument(index = 0, required = true, metaVar = "NAME", usage = "project to delete")
   private ProjectState projectState;
 
@@ -66,14 +58,23 @@
       preConditions.assertDeletePermission(rsrc);
 
       if (!yesReallyDelete) {
-        throw new UnloggedFailure(String.format(REALLY_DELETE, rsrc.getName()));
+        throw new UnloggedFailure(
+            String.format(
+                "Really delete '%s'?\n"
+                    + "This is an operation which permanently deletes data. This cannot be undone!\n"
+                    + "If you are sure you wish to delete this project, re-run with the "
+                    + "--yes-really-delete flag.\n",
+                rsrc.getName()));
       }
 
       if (!force) {
         try {
           preConditions.assertHasOpenChanges(rsrc.getNameKey(), false);
         } catch (CannotDeleteProjectException e) {
-          throw new UnloggedFailure(String.format(FORCE_DELETE, e.getMessage(), rsrc.getName()));
+          throw new UnloggedFailure(
+              String.format(
+                  "%s - To really delete '%s', re-run with the --force flag.",
+                  e.getMessage(), rsrc.getName()));
         }
       }